From 200f6ebbabfe6e0045e0f7b3cb6a2a946f0e22ab Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 08:12:45 +0000 Subject: import rh-java-common-snakeyaml-1.13-9.2.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..19f653b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/snakeyaml-1.13.zip diff --git a/.rh-java-common-snakeyaml.metadata b/.rh-java-common-snakeyaml.metadata new file mode 100644 index 0000000..a77bb9f --- /dev/null +++ b/.rh-java-common-snakeyaml.metadata @@ -0,0 +1 @@ +88afc1d83cb2a5288d81972f15871e463d758de2 SOURCES/snakeyaml-1.13.zip diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Replace-bundled-base64-implementation.patch b/SOURCES/0001-Replace-bundled-base64-implementation.patch new file mode 100644 index 0000000..891616b --- /dev/null +++ b/SOURCES/0001-Replace-bundled-base64-implementation.patch @@ -0,0 +1,407 @@ +From a524758e35ce71a1839bb8594e9c3af93f335f1d Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Wed, 24 Apr 2013 11:25:52 +0200 +Subject: [PATCH] Replace bundled base64 implementation + +--- + pom.xml | 5 + + .../snakeyaml/constructor/SafeConstructor.java | 3 +- + .../external/biz/base64Coder/Base64Coder.java | 305 --------------------- + .../snakeyaml/representer/SafeRepresenter.java | 3 +- + .../source_code/base64Coder/Base64CoderTest.java | 2 +- + .../snakeyaml/issues/issue99/YamlBase64Test.java | 3 +- + 6 files changed, 12 insertions(+), 309 deletions(-) + delete mode 100644 src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java + +diff --git a/pom.xml b/pom.xml +index 013e07e..629a49c 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -78,6 +78,11 @@ + 1.6 + test + ++ ++ biz.source_code ++ base64coder ++ 2010-12-19 ++ + + + +diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java +index e8f4214..651a497 100644 +--- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java ++++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java +@@ -29,8 +29,9 @@ import java.util.TimeZone; + import java.util.regex.Matcher; + import java.util.regex.Pattern; + ++import biz.source_code.base64Coder.Base64Coder; ++ + import org.yaml.snakeyaml.error.YAMLException; +-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; + import org.yaml.snakeyaml.nodes.MappingNode; + import org.yaml.snakeyaml.nodes.Node; + import org.yaml.snakeyaml.nodes.NodeId; +diff --git a/src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java b/src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java +deleted file mode 100644 +index 65923b6..0000000 +--- a/src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java ++++ /dev/null +@@ -1,305 +0,0 @@ +-// Copyright 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland +-// www.source-code.biz, www.inventec.ch/chdh +-// +-// This module is multi-licensed and may be used under the terms +-// of any of the following licenses: +-// +-// EPL, Eclipse Public License, V1.0 or later, http://www.eclipse.org/legal +-// LGPL, GNU Lesser General Public License, V2.1 or later, http://www.gnu.org/licenses/lgpl.html +-// GPL, GNU General Public License, V2 or later, http://www.gnu.org/licenses/gpl.html +-// AL, Apache License, V2.0 or later, http://www.apache.org/licenses +-// BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php +-// +-// Please contact the author if you need another license. +-// This module is provided "as is", without warranties of any kind. +- +-package org.yaml.snakeyaml.external.biz.base64Coder; +- +-/** +- * A Base64 encoder/decoder. +- * +- *

+- * This class is used to encode and decode data in Base64 format as described in +- * RFC 1521. +- * +- *

+- * Project home page: www. +- * source-code.biz/base64coder/java
+- * Author: Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland
+- * Multi-licensed: EPL / LGPL / GPL / AL / BSD. +- */ +-public class Base64Coder { +- +- // The line separator string of the operating system. +- private static final String systemLineSeparator = System.getProperty("line.separator"); +- +- // Mapping table from 6-bit nibbles to Base64 characters. +- private static char[] map1 = new char[64]; +- static { +- int i = 0; +- for (char c = 'A'; c <= 'Z'; c++) +- map1[i++] = c; +- for (char c = 'a'; c <= 'z'; c++) +- map1[i++] = c; +- for (char c = '0'; c <= '9'; c++) +- map1[i++] = c; +- map1[i++] = '+'; +- map1[i++] = '/'; +- } +- +- // Mapping table from Base64 characters to 6-bit nibbles. +- private static byte[] map2 = new byte[128]; +- static { +- for (int i = 0; i < map2.length; i++) +- map2[i] = -1; +- for (int i = 0; i < 64; i++) +- map2[map1[i]] = (byte) i; +- } +- +- /** +- * Encodes a string into Base64 format. No blanks or line breaks are +- * inserted. +- * +- * @param s +- * A String to be encoded. +- * @return A String containing the Base64 encoded data. +- */ +- public static String encodeString(String s) { +- return new String(encode(s.getBytes())); +- } +- +- /** +- * Encodes a byte array into Base 64 format and breaks the output into lines +- * of 76 characters. This method is compatible with +- * sun.misc.BASE64Encoder.encodeBuffer(byte[]). +- * +- * @param in +- * An array containing the data bytes to be encoded. +- * @return A String containing the Base64 encoded data, broken into lines. +- */ +- public static String encodeLines(byte[] in) { +- return encodeLines(in, 0, in.length, 76, systemLineSeparator); +- } +- +- /** +- * Encodes a byte array into Base 64 format and breaks the output into +- * lines. +- * +- * @param in +- * An array containing the data bytes to be encoded. +- * @param iOff +- * Offset of the first byte in in to be processed. +- * @param iLen +- * Number of bytes to be processed in in, starting +- * at iOff. +- * @param lineLen +- * Line length for the output data. Should be a multiple of 4. +- * @param lineSeparator +- * The line separator to be used to separate the output lines. +- * @return A String containing the Base64 encoded data, broken into lines. +- */ +- public static String encodeLines(byte[] in, int iOff, int iLen, int lineLen, +- String lineSeparator) { +- int blockLen = (lineLen * 3) / 4; +- if (blockLen <= 0) +- throw new IllegalArgumentException(); +- int lines = (iLen + blockLen - 1) / blockLen; +- int bufLen = ((iLen + 2) / 3) * 4 + lines * lineSeparator.length(); +- StringBuilder buf = new StringBuilder(bufLen); +- int ip = 0; +- while (ip < iLen) { +- int l = Math.min(iLen - ip, blockLen); +- buf.append(encode(in, iOff + ip, l)); +- buf.append(lineSeparator); +- ip += l; +- } +- return buf.toString(); +- } +- +- /** +- * Encodes a byte array into Base64 format. No blanks or line breaks are +- * inserted in the output. +- * +- * @param in +- * An array containing the data bytes to be encoded. +- * @return A character array containing the Base64 encoded data. +- */ +- public static char[] encode(byte[] in) { +- return encode(in, 0, in.length); +- } +- +- /** +- * Encodes a byte array into Base64 format. No blanks or line breaks are +- * inserted in the output. +- * +- * @param in +- * An array containing the data bytes to be encoded. +- * @param iLen +- * Number of bytes to process in in. +- * @return A character array containing the Base64 encoded data. +- */ +- public static char[] encode(byte[] in, int iLen) { +- return encode(in, 0, iLen); +- } +- +- /** +- * Encodes a byte array into Base64 format. No blanks or line breaks are +- * inserted in the output. +- * +- * @param in +- * An array containing the data bytes to be encoded. +- * @param iOff +- * Offset of the first byte in in to be processed. +- * @param iLen +- * Number of bytes to process in in, starting at +- * iOff. +- * @return A character array containing the Base64 encoded data. +- */ +- public static char[] encode(byte[] in, int iOff, int iLen) { +- int oDataLen = (iLen * 4 + 2) / 3; // output length without padding +- int oLen = ((iLen + 2) / 3) * 4; // output length including padding +- char[] out = new char[oLen]; +- int ip = iOff; +- int iEnd = iOff + iLen; +- int op = 0; +- while (ip < iEnd) { +- int i0 = in[ip++] & 0xff; +- int i1 = ip < iEnd ? in[ip++] & 0xff : 0; +- int i2 = ip < iEnd ? in[ip++] & 0xff : 0; +- int o0 = i0 >>> 2; +- int o1 = ((i0 & 3) << 4) | (i1 >>> 4); +- int o2 = ((i1 & 0xf) << 2) | (i2 >>> 6); +- int o3 = i2 & 0x3F; +- out[op++] = map1[o0]; +- out[op++] = map1[o1]; +- out[op] = op < oDataLen ? map1[o2] : '='; +- op++; +- out[op] = op < oDataLen ? map1[o3] : '='; +- op++; +- } +- return out; +- } +- +- /** +- * Decodes a string from Base64 format. No blanks or line breaks are allowed +- * within the Base64 encoded input data. +- * +- * @param s +- * A Base64 String to be decoded. +- * @return A String containing the decoded data. +- * @throws IllegalArgumentException +- * If the input is not valid Base64 encoded data. +- */ +- public static String decodeString(String s) { +- return new String(decode(s)); +- } +- +- /** +- * Decodes a byte array from Base64 format and ignores line separators, tabs +- * and blanks. CR, LF, Tab and Space characters are ignored in the input +- * data. This method is compatible with +- * sun.misc.BASE64Decoder.decodeBuffer(String). +- * +- * @param s +- * A Base64 String to be decoded. +- * @return An array containing the decoded data bytes. +- * @throws IllegalArgumentException +- * If the input is not valid Base64 encoded data. +- */ +- public static byte[] decodeLines(String s) { +- char[] buf = new char[s.length()]; +- int p = 0; +- for (int ip = 0; ip < s.length(); ip++) { +- char c = s.charAt(ip); +- if (c != ' ' && c != '\r' && c != '\n' && c != '\t') +- buf[p++] = c; +- } +- return decode(buf, 0, p); +- } +- +- /** +- * Decodes a byte array from Base64 format. No blanks or line breaks are +- * allowed within the Base64 encoded input data. +- * +- * @param s +- * A Base64 String to be decoded. +- * @return An array containing the decoded data bytes. +- * @throws IllegalArgumentException +- * If the input is not valid Base64 encoded data. +- */ +- public static byte[] decode(String s) { +- return decode(s.toCharArray()); +- } +- +- /** +- * Decodes a byte array from Base64 format. No blanks or line breaks are +- * allowed within the Base64 encoded input data. +- * +- * @param in +- * A character array containing the Base64 encoded data. +- * @return An array containing the decoded data bytes. +- * @throws IllegalArgumentException +- * If the input is not valid Base64 encoded data. +- */ +- public static byte[] decode(char[] in) { +- return decode(in, 0, in.length); +- } +- +- /** +- * Decodes a byte array from Base64 format. No blanks or line breaks are +- * allowed within the Base64 encoded input data. +- * +- * @param in +- * A character array containing the Base64 encoded data. +- * @param iOff +- * Offset of the first character in in to be +- * processed. +- * @param iLen +- * Number of characters to process in in, starting +- * at iOff. +- * @return An array containing the decoded data bytes. +- * @throws IllegalArgumentException +- * If the input is not valid Base64 encoded data. +- */ +- public static byte[] decode(char[] in, int iOff, int iLen) { +- if (iLen % 4 != 0) +- throw new IllegalArgumentException( +- "Length of Base64 encoded input string is not a multiple of 4."); +- while (iLen > 0 && in[iOff + iLen - 1] == '=') +- iLen--; +- int oLen = (iLen * 3) / 4; +- byte[] out = new byte[oLen]; +- int ip = iOff; +- int iEnd = iOff + iLen; +- int op = 0; +- while (ip < iEnd) { +- int i0 = in[ip++]; +- int i1 = in[ip++]; +- int i2 = ip < iEnd ? in[ip++] : 'A'; +- int i3 = ip < iEnd ? in[ip++] : 'A'; +- if (i0 > 127 || i1 > 127 || i2 > 127 || i3 > 127) +- throw new IllegalArgumentException("Illegal character in Base64 encoded data."); +- int b0 = map2[i0]; +- int b1 = map2[i1]; +- int b2 = map2[i2]; +- int b3 = map2[i3]; +- if (b0 < 0 || b1 < 0 || b2 < 0 || b3 < 0) +- throw new IllegalArgumentException("Illegal character in Base64 encoded data."); +- int o0 = (b0 << 2) | (b1 >>> 4); +- int o1 = ((b1 & 0xf) << 4) | (b2 >>> 2); +- int o2 = ((b2 & 3) << 6) | b3; +- out[op++] = (byte) o0; +- if (op < oLen) +- out[op++] = (byte) o1; +- if (op < oLen) +- out[op++] = (byte) o2; +- } +- return out; +- } +- +- // Dummy constructor. +- private Base64Coder() { +- } +- +-} // end class Base64Coder +diff --git a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java +index b4b618f..93b5dcd 100644 +--- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java ++++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java +@@ -30,8 +30,9 @@ import java.util.Set; + import java.util.TimeZone; + import java.util.regex.Pattern; + ++import biz.source_code.base64Coder.Base64Coder; ++ + import org.yaml.snakeyaml.error.YAMLException; +-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; + import org.yaml.snakeyaml.nodes.Node; + import org.yaml.snakeyaml.nodes.Tag; + import org.yaml.snakeyaml.reader.StreamReader; +diff --git a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java +index 397fb7c..002f4c7 100644 +--- a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java ++++ b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java +@@ -19,7 +19,7 @@ import java.io.UnsupportedEncodingException; + + import junit.framework.TestCase; + +-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; ++import biz.source_code.base64Coder.Base64Coder; + + public class Base64CoderTest extends TestCase { + +diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java +index f04ffe8..9a105b9 100644 +--- a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java ++++ b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java +@@ -22,12 +22,13 @@ import java.util.Map; + + import junit.framework.TestCase; + ++import biz.source_code.base64Coder.Base64Coder; ++ + import org.yaml.snakeyaml.Util; + import org.yaml.snakeyaml.Yaml; + import org.yaml.snakeyaml.YamlDocument; + import org.yaml.snakeyaml.constructor.AbstractConstruct; + import org.yaml.snakeyaml.constructor.Constructor; +-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; + import org.yaml.snakeyaml.nodes.Node; + import org.yaml.snakeyaml.nodes.ScalarNode; + import org.yaml.snakeyaml.nodes.Tag; +-- +1.8.1.4 + diff --git a/SOURCES/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch b/SOURCES/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch new file mode 100644 index 0000000..39bb51c --- /dev/null +++ b/SOURCES/0002-Replace-bundled-gdata-java-client-classes-with-commo.patch @@ -0,0 +1,979 @@ +From 9104006de9e3e601d2ac6c733b38e6c29728b2ce Mon Sep 17 00:00:00 2001 +From: Michal Srb +Date: Fri, 26 Apr 2013 07:32:04 +0200 +Subject: [PATCH] Replace bundled gdata-java-client classes with commons-codec + +--- + .../com/google/gdata/util/common/base/Escaper.java | 97 ---- + .../gdata/util/common/base/PercentEscaper.java | 281 ------------ + .../gdata/util/common/base/UnicodeEscaper.java | 506 --------------------- + .../java/org/yaml/snakeyaml/util/UriEncoder.java | 37 +- + 4 files changed, 29 insertions(+), 892 deletions(-) + delete mode 100644 src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java + delete mode 100644 src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java + delete mode 100644 src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java + +diff --git a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java +deleted file mode 100644 +index c26e3cb..0000000 +--- a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java ++++ /dev/null +@@ -1,97 +0,0 @@ +-/* Copyright (c) 2008 Google Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package org.yaml.snakeyaml.external.com.google.gdata.util.common.base; +- +-/** +- * An object that converts literal text into a format safe for inclusion in a +- * particular context (such as an XML document). Typically (but not always), the +- * inverse process of "unescaping" the text is performed automatically by the +- * relevant parser. +- * +- *

+- * For example, an XML escaper would convert the literal string +- * {@code "Foo"} into {@code "Foo<Bar>"} to prevent {@code ""} +- * from being confused with an XML tag. When the resulting XML document is +- * parsed, the parser API will return this text as the original literal string +- * {@code "Foo"}. +- * +- *

+- * An {@code Escaper} instance is required to be stateless, and safe when used +- * concurrently by multiple threads. +- * +- *

+- * Several popular escapers are defined as constants in the class +- * {@link CharEscapers}. To create your own escapers, use +- * {@link CharEscaperBuilder}, or extend {@link CharEscaper} or +- * {@code UnicodeEscaper}. +- * +- * +- */ +-public interface Escaper { +- /** +- * Returns the escaped form of a given literal string. +- * +- *

+- * Note that this method may treat input characters differently depending on +- * the specific escaper implementation. +- *

    +- *
  • {@link UnicodeEscaper} handles UTF-16 correctly, +- * including surrogate character pairs. If the input is badly formed the +- * escaper should throw {@link IllegalArgumentException}. +- *
  • {@link CharEscaper} handles Java characters independently and does +- * not verify the input for well formed characters. A CharEscaper should not +- * be used in situations where input is not guaranteed to be restricted to +- * the Basic Multilingual Plane (BMP). +- *
+- * +- * @param string +- * the literal string to be escaped +- * @return the escaped form of {@code string} +- * @throws NullPointerException +- * if {@code string} is null +- * @throws IllegalArgumentException +- * if {@code string} contains badly formed UTF-16 or cannot be +- * escaped for any other reason +- */ +- public String escape(String string); +- +- /** +- * Returns an {@code Appendable} instance which automatically escapes all +- * text appended to it before passing the resulting text to an underlying +- * {@code Appendable}. +- * +- *

+- * Note that this method may treat input characters differently depending on +- * the specific escaper implementation. +- *

    +- *
  • {@link UnicodeEscaper} handles UTF-16 correctly, +- * including surrogate character pairs. If the input is badly formed the +- * escaper should throw {@link IllegalArgumentException}. +- *
  • {@link CharEscaper} handles Java characters independently and does +- * not verify the input for well formed characters. A CharEscaper should not +- * be used in situations where input is not guaranteed to be restricted to +- * the Basic Multilingual Plane (BMP). +- *
+- * +- * @param out +- * the underlying {@code Appendable} to append escaped output to +- * @return an {@code Appendable} which passes text to {@code out} after +- * escaping it. +- */ +- public Appendable escape(Appendable out); +-} +diff --git a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java +deleted file mode 100644 +index 5e2f902..0000000 +--- a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java ++++ /dev/null +@@ -1,281 +0,0 @@ +-/* Copyright (c) 2008 Google Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package org.yaml.snakeyaml.external.com.google.gdata.util.common.base; +- +-/** +- * A {@code UnicodeEscaper} that escapes some set of Java characters using the +- * URI percent encoding scheme. The set of safe characters (those which remain +- * unescaped) can be specified on construction. +- * +- *

+- * For details on escaping URIs for use in web pages, see section 2.4 of RFC 3986. +- * +- *

+- * In most cases this class should not need to be used directly. If you have no +- * special requirements for escaping your URIs, you should use either +- * {@link CharEscapers#uriEscaper()} or {@link CharEscapers#uriEscaper(boolean)}. +- * +- *

+- * When encoding a String, the following rules apply: +- *

    +- *
  • The alphanumeric characters "a" through "z", "A" through "Z" and "0" +- * through "9" remain the same. +- *
  • Any additionally specified safe characters remain the same. +- *
  • If {@code plusForSpace} was specified, the space character " " is +- * converted into a plus sign "+". +- *
  • All other characters are converted into one or more bytes using UTF-8 +- * encoding and each byte is then represented by the 3-character string "%XY", +- * where "XY" is the two-digit, uppercase, hexadecimal representation of the +- * byte value. +- *
+- * +- *

+- * RFC 2396 specifies the set of unreserved characters as "-", "_", ".", "!", +- * "~", "*", "'", "(" and ")". It goes on to state: +- * +- *

+- * Unreserved characters can be escaped without changing the semantics of the +- * URI, but this should not be done unless the URI is being used in a context +- * that does not allow the unescaped character to appear. +- * +- *

+- * For performance reasons the only currently supported character encoding of +- * this class is UTF-8. +- * +- *

+- * Note: This escaper produces uppercase hexidecimal sequences. From RFC 3986:
+- * "URI producers and normalizers should use uppercase hexadecimal digits for +- * all percent-encodings." +- * +- * +- */ +-public class PercentEscaper extends UnicodeEscaper { +- /** +- * A string of safe characters that mimics the behavior of +- * {@link java.net.URLEncoder}. +- * +- */ +- public static final String SAFECHARS_URLENCODER = "-_.*"; +- +- /** +- * A string of characters that do not need to be encoded when used in URI +- * path segments, as specified in RFC 3986. Note that some of these +- * characters do need to be escaped when used in other parts of the URI. +- */ +- public static final String SAFEPATHCHARS_URLENCODER = "-_.!~*'()@:$&,;="; +- +- /** +- * A string of characters that do not need to be encoded when used in URI +- * query strings, as specified in RFC 3986. Note that some of these +- * characters do need to be escaped when used in other parts of the URI. +- */ +- public static final String SAFEQUERYSTRINGCHARS_URLENCODER = "-_.!~*'()@:$,;/?:"; +- +- // In some uri escapers spaces are escaped to '+' +- private static final char[] URI_ESCAPED_SPACE = { '+' }; +- +- private static final char[] UPPER_HEX_DIGITS = "0123456789ABCDEF".toCharArray(); +- +- /** +- * If true we should convert space to the {@code +} character. +- */ +- private final boolean plusForSpace; +- +- /** +- * An array of flags where for any {@code char c} if {@code safeOctets[c]} +- * is true then {@code c} should remain unmodified in the output. If +- * {@code c > safeOctets.length} then it should be escaped. +- */ +- private final boolean[] safeOctets; +- +- /** +- * Constructs a URI escaper with the specified safe characters and optional +- * handling of the space character. +- * +- * @param safeChars +- * a non null string specifying additional safe characters for +- * this escaper (the ranges 0..9, a..z and A..Z are always safe +- * and should not be specified here) +- * @param plusForSpace +- * true if ASCII space should be escaped to {@code +} rather than +- * {@code %20} +- * @throws IllegalArgumentException +- * if any of the parameters were invalid +- */ +- public PercentEscaper(String safeChars, boolean plusForSpace) { +- // Avoid any misunderstandings about the behavior of this escaper +- if (safeChars.matches(".*[0-9A-Za-z].*")) { +- throw new IllegalArgumentException( +- "Alphanumeric characters are always 'safe' and should not be " +- + "explicitly specified"); +- } +- // Avoid ambiguous parameters. Safe characters are never modified so if +- // space is a safe character then setting plusForSpace is meaningless. +- if (plusForSpace && safeChars.contains(" ")) { +- throw new IllegalArgumentException( +- "plusForSpace cannot be specified when space is a 'safe' character"); +- } +- if (safeChars.contains("%")) { +- throw new IllegalArgumentException("The '%' character cannot be specified as 'safe'"); +- } +- this.plusForSpace = plusForSpace; +- this.safeOctets = createSafeOctets(safeChars); +- } +- +- /** +- * Creates a boolean[] with entries corresponding to the character values +- * for 0-9, A-Z, a-z and those specified in safeChars set to true. The array +- * is as small as is required to hold the given character information. +- */ +- private static boolean[] createSafeOctets(String safeChars) { +- int maxChar = 'z'; +- char[] safeCharArray = safeChars.toCharArray(); +- for (char c : safeCharArray) { +- maxChar = Math.max(c, maxChar); +- } +- boolean[] octets = new boolean[maxChar + 1]; +- for (int c = '0'; c <= '9'; c++) { +- octets[c] = true; +- } +- for (int c = 'A'; c <= 'Z'; c++) { +- octets[c] = true; +- } +- for (int c = 'a'; c <= 'z'; c++) { +- octets[c] = true; +- } +- for (char c : safeCharArray) { +- octets[c] = true; +- } +- return octets; +- } +- +- /* +- * Overridden for performance. For unescaped strings this improved the +- * performance of the uri escaper from ~760ns to ~400ns as measured by +- * {@link CharEscapersBenchmark}. +- */ +- @Override +- protected int nextEscapeIndex(CharSequence csq, int index, int end) { +- for (; index < end; index++) { +- char c = csq.charAt(index); +- if (c >= safeOctets.length || !safeOctets[c]) { +- break; +- } +- } +- return index; +- } +- +- /* +- * Overridden for performance. For unescaped strings this improved the +- * performance of the uri escaper from ~400ns to ~170ns as measured by +- * {@link CharEscapersBenchmark}. +- */ +- @Override +- public String escape(String s) { +- int slen = s.length(); +- for (int index = 0; index < slen; index++) { +- char c = s.charAt(index); +- if (c >= safeOctets.length || !safeOctets[c]) { +- return escapeSlow(s, index); +- } +- } +- return s; +- } +- +- /** +- * Escapes the given Unicode code point in UTF-8. +- */ +- @Override +- protected char[] escape(int cp) { +- // We should never get negative values here but if we do it will throw +- // an +- // IndexOutOfBoundsException, so at least it will get spotted. +- if (cp < safeOctets.length && safeOctets[cp]) { +- return null; +- } else if (cp == ' ' && plusForSpace) { +- return URI_ESCAPED_SPACE; +- } else if (cp <= 0x7F) { +- // Single byte UTF-8 characters +- // Start with "%--" and fill in the blanks +- char[] dest = new char[3]; +- dest[0] = '%'; +- dest[2] = UPPER_HEX_DIGITS[cp & 0xF]; +- dest[1] = UPPER_HEX_DIGITS[cp >>> 4]; +- return dest; +- } else if (cp <= 0x7ff) { +- // Two byte UTF-8 characters [cp >= 0x80 && cp <= 0x7ff] +- // Start with "%--%--" and fill in the blanks +- char[] dest = new char[6]; +- dest[0] = '%'; +- dest[3] = '%'; +- dest[5] = UPPER_HEX_DIGITS[cp & 0xF]; +- cp >>>= 4; +- dest[4] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)]; +- cp >>>= 2; +- dest[2] = UPPER_HEX_DIGITS[cp & 0xF]; +- cp >>>= 4; +- dest[1] = UPPER_HEX_DIGITS[0xC | cp]; +- return dest; +- } else if (cp <= 0xffff) { +- // Three byte UTF-8 characters [cp >= 0x800 && cp <= 0xffff] +- // Start with "%E-%--%--" and fill in the blanks +- char[] dest = new char[9]; +- dest[0] = '%'; +- dest[1] = 'E'; +- dest[3] = '%'; +- dest[6] = '%'; +- dest[8] = UPPER_HEX_DIGITS[cp & 0xF]; +- cp >>>= 4; +- dest[7] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)]; +- cp >>>= 2; +- dest[5] = UPPER_HEX_DIGITS[cp & 0xF]; +- cp >>>= 4; +- dest[4] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)]; +- cp >>>= 2; +- dest[2] = UPPER_HEX_DIGITS[cp]; +- return dest; +- } else if (cp <= 0x10ffff) { +- char[] dest = new char[12]; +- // Four byte UTF-8 characters [cp >= 0xffff && cp <= 0x10ffff] +- // Start with "%F-%--%--%--" and fill in the blanks +- dest[0] = '%'; +- dest[1] = 'F'; +- dest[3] = '%'; +- dest[6] = '%'; +- dest[9] = '%'; +- dest[11] = UPPER_HEX_DIGITS[cp & 0xF]; +- cp >>>= 4; +- dest[10] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)]; +- cp >>>= 2; +- dest[8] = UPPER_HEX_DIGITS[cp & 0xF]; +- cp >>>= 4; +- dest[7] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)]; +- cp >>>= 2; +- dest[5] = UPPER_HEX_DIGITS[cp & 0xF]; +- cp >>>= 4; +- dest[4] = UPPER_HEX_DIGITS[0x8 | (cp & 0x3)]; +- cp >>>= 2; +- dest[2] = UPPER_HEX_DIGITS[cp & 0x7]; +- return dest; +- } else { +- // If this ever happens it is due to bug in UnicodeEscaper, not bad +- // input. +- throw new IllegalArgumentException("Invalid unicode character value " + cp); +- } +- } +-} +diff --git a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java b/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java +deleted file mode 100644 +index 5403185..0000000 +--- a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java ++++ /dev/null +@@ -1,506 +0,0 @@ +-/* Copyright (c) 2008 Google Inc. +- * +- * Licensed under the Apache License, Version 2.0 (the "License"); +- * you may not use this file except in compliance with the License. +- * You may obtain a copy of the License at +- * +- * http://www.apache.org/licenses/LICENSE-2.0 +- * +- * Unless required by applicable law or agreed to in writing, software +- * distributed under the License is distributed on an "AS IS" BASIS, +- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +- * See the License for the specific language governing permissions and +- * limitations under the License. +- */ +- +-package org.yaml.snakeyaml.external.com.google.gdata.util.common.base; +- +-import java.io.IOException; +- +-/** +- * An {@link Escaper} that converts literal text into a format safe for +- * inclusion in a particular context (such as an XML document). Typically (but +- * not always), the inverse process of "unescaping" the text is performed +- * automatically by the relevant parser. +- * +- *

+- * For example, an XML escaper would convert the literal string +- * {@code "Foo"} into {@code "Foo<Bar>"} to prevent {@code ""} +- * from being confused with an XML tag. When the resulting XML document is +- * parsed, the parser API will return this text as the original literal string +- * {@code "Foo"}. +- * +- *

+- * Note: This class is similar to {@link CharEscaper} but with one very +- * important difference. A CharEscaper can only process Java UTF16 characters in isolation +- * and may not cope when it encounters surrogate pairs. This class facilitates +- * the correct escaping of all Unicode characters. +- * +- *

+- * As there are important reasons, including potential security issues, to +- * handle Unicode correctly if you are considering implementing a new escaper +- * you should favor using UnicodeEscaper wherever possible. +- * +- *

+- * A {@code UnicodeEscaper} instance is required to be stateless, and safe when +- * used concurrently by multiple threads. +- * +- *

+- * Several popular escapers are defined as constants in the class +- * {@link CharEscapers}. To create your own escapers extend this class and +- * implement the {@link #escape(int)} method. +- * +- * +- */ +-public abstract class UnicodeEscaper implements Escaper { +- /** The amount of padding (chars) to use when growing the escape buffer. */ +- private static final int DEST_PAD = 32; +- +- /** +- * Returns the escaped form of the given Unicode code point, or {@code null} +- * if this code point does not need to be escaped. When called as part of an +- * escaping operation, the given code point is guaranteed to be in the range +- * {@code 0 <= cp <= Character#MAX_CODE_POINT}. +- * +- *

+- * If an empty array is returned, this effectively strips the input +- * character from the resulting text. +- * +- *

+- * If the character does not need to be escaped, this method should return +- * {@code null}, rather than an array containing the character +- * representation of the code point. This enables the escaping algorithm to +- * perform more efficiently. +- * +- *

+- * If the implementation of this method cannot correctly handle a particular +- * code point then it should either throw an appropriate runtime exception +- * or return a suitable replacement character. It must never silently +- * discard invalid input as this may constitute a security risk. +- * +- * @param cp +- * the Unicode code point to escape if necessary +- * @return the replacement characters, or {@code null} if no escaping was +- * needed +- */ +- protected abstract char[] escape(int cp); +- +- /** +- * Scans a sub-sequence of characters from a given {@link CharSequence}, +- * returning the index of the next character that requires escaping. +- * +- *

+- * Note: When implementing an escaper, it is a good idea to override +- * this method for efficiency. The base class implementation determines +- * successive Unicode code points and invokes {@link #escape(int)} for each +- * of them. If the semantics of your escaper are such that code points in +- * the supplementary range are either all escaped or all unescaped, this +- * method can be implemented more efficiently using +- * {@link CharSequence#charAt(int)}. +- * +- *

+- * Note however that if your escaper does not escape characters in the +- * supplementary range, you should either continue to validate the +- * correctness of any surrogate characters encountered or provide a clear +- * warning to users that your escaper does not validate its input. +- * +- *

+- * See {@link PercentEscaper} for an example. +- * +- * @param csq +- * a sequence of characters +- * @param start +- * the index of the first character to be scanned +- * @param end +- * the index immediately after the last character to be scanned +- * @throws IllegalArgumentException +- * if the scanned sub-sequence of {@code csq} contains invalid +- * surrogate pairs +- */ +- protected int nextEscapeIndex(CharSequence csq, int start, int end) { +- int index = start; +- while (index < end) { +- int cp = codePointAt(csq, index, end); +- if (cp < 0 || escape(cp) != null) { +- break; +- } +- index += Character.isSupplementaryCodePoint(cp) ? 2 : 1; +- } +- return index; +- } +- +- /** +- * Returns the escaped form of a given literal string. +- * +- *

+- * If you are escaping input in arbitrary successive chunks, then it is not +- * generally safe to use this method. If an input string ends with an +- * unmatched high surrogate character, then this method will throw +- * {@link IllegalArgumentException}. You should either ensure your input is +- * valid UTF-16 before +- * calling this method or use an escaped {@link Appendable} (as returned by +- * {@link #escape(Appendable)}) which can cope with arbitrarily split input. +- * +- *

+- * Note: When implementing an escaper it is a good idea to override +- * this method for efficiency by inlining the implementation of +- * {@link #nextEscapeIndex(CharSequence, int, int)} directly. Doing this for +- * {@link PercentEscaper} more than doubled the performance for unescaped +- * strings (as measured by {@link CharEscapersBenchmark}). +- * +- * @param string +- * the literal string to be escaped +- * @return the escaped form of {@code string} +- * @throws NullPointerException +- * if {@code string} is null +- * @throws IllegalArgumentException +- * if invalid surrogate characters are encountered +- */ +- public String escape(String string) { +- int end = string.length(); +- int index = nextEscapeIndex(string, 0, end); +- return index == end ? string : escapeSlow(string, index); +- } +- +- /** +- * Returns the escaped form of a given literal string, starting at the given +- * index. This method is called by the {@link #escape(String)} method when +- * it discovers that escaping is required. It is protected to allow +- * subclasses to override the fastpath escaping function to inline their +- * escaping test. See {@link CharEscaperBuilder} for an example usage. +- * +- *

+- * This method is not reentrant and may only be invoked by the top level +- * {@link #escape(String)} method. +- * +- * @param s +- * the literal string to be escaped +- * @param index +- * the index to start escaping from +- * @return the escaped form of {@code string} +- * @throws NullPointerException +- * if {@code string} is null +- * @throws IllegalArgumentException +- * if invalid surrogate characters are encountered +- */ +- protected final String escapeSlow(String s, int index) { +- int end = s.length(); +- +- // Get a destination buffer and setup some loop variables. +- char[] dest = DEST_TL.get(); +- int destIndex = 0; +- int unescapedChunkStart = 0; +- +- while (index < end) { +- int cp = codePointAt(s, index, end); +- if (cp < 0) { +- throw new IllegalArgumentException("Trailing high surrogate at end of input"); +- } +- char[] escaped = escape(cp); +- if (escaped != null) { +- int charsSkipped = index - unescapedChunkStart; +- +- // This is the size needed to add the replacement, not the full +- // size needed by the string. We only regrow when we absolutely +- // must. +- int sizeNeeded = destIndex + charsSkipped + escaped.length; +- if (dest.length < sizeNeeded) { +- int destLength = sizeNeeded + (end - index) + DEST_PAD; +- dest = growBuffer(dest, destIndex, destLength); +- } +- // If we have skipped any characters, we need to copy them now. +- if (charsSkipped > 0) { +- s.getChars(unescapedChunkStart, index, dest, destIndex); +- destIndex += charsSkipped; +- } +- if (escaped.length > 0) { +- System.arraycopy(escaped, 0, dest, destIndex, escaped.length); +- destIndex += escaped.length; +- } +- } +- unescapedChunkStart = index + (Character.isSupplementaryCodePoint(cp) ? 2 : 1); +- index = nextEscapeIndex(s, unescapedChunkStart, end); +- } +- +- // Process trailing unescaped characters - no need to account for +- // escaped +- // length or padding the allocation. +- int charsSkipped = end - unescapedChunkStart; +- if (charsSkipped > 0) { +- int endIndex = destIndex + charsSkipped; +- if (dest.length < endIndex) { +- dest = growBuffer(dest, destIndex, endIndex); +- } +- s.getChars(unescapedChunkStart, end, dest, destIndex); +- destIndex = endIndex; +- } +- return new String(dest, 0, destIndex); +- } +- +- /** +- * Returns an {@code Appendable} instance which automatically escapes all +- * text appended to it before passing the resulting text to an underlying +- * {@code Appendable}. +- * +- *

+- * Unlike {@link #escape(String)} it is permitted to append arbitrarily +- * split input to this Appendable, including input that is split over a +- * surrogate pair. In this case the pending high surrogate character will +- * not be processed until the corresponding low surrogate is appended. This +- * means that a trailing high surrogate character at the end of the input +- * cannot be detected and will be silently ignored. This is unavoidable +- * since the Appendable interface has no {@code close()} method, and it is +- * impossible to determine when the last characters have been appended. +- * +- *

+- * The methods of the returned object will propagate any exceptions thrown +- * by the underlying {@code Appendable}. +- * +- *

+- * For well formed UTF-16 +- * the escaping behavior is identical to that of {@link #escape(String)} and +- * the following code is equivalent to (but much slower than) +- * {@code escaper.escape(string)}: +- * +- * 

+-     * {
+-     *     @code
+-     *     StringBuilder sb = new StringBuilder();
+-     *     escaper.escape(sb).append(string);
+-     *     return sb.toString();
+-     * }
+-     *
+- * +- * @param out +- * the underlying {@code Appendable} to append escaped output to +- * @return an {@code Appendable} which passes text to {@code out} after +- * escaping it +- * @throws NullPointerException +- * if {@code out} is null +- * @throws IllegalArgumentException +- * if invalid surrogate characters are encountered +- * +- */ +- public Appendable escape(final Appendable out) { +- assert out != null; +- +- return new Appendable() { +- int pendingHighSurrogate = -1; +- char[] decodedChars = new char[2]; +- +- public Appendable append(CharSequence csq) throws IOException { +- return append(csq, 0, csq.length()); +- } +- +- public Appendable append(CharSequence csq, int start, int end) throws IOException { +- int index = start; +- if (index < end) { +- // This is a little subtle: index must never reference the +- // middle of a +- // surrogate pair but unescapedChunkStart can. The first +- // time we enter +- // the loop below it is possible that index != +- // unescapedChunkStart. +- int unescapedChunkStart = index; +- if (pendingHighSurrogate != -1) { +- // Our last append operation ended halfway through a +- // surrogate pair +- // so we have to do some extra work first. +- char c = csq.charAt(index++); +- if (!Character.isLowSurrogate(c)) { +- throw new IllegalArgumentException( +- "Expected low surrogate character but got " + c); +- } +- char[] escaped = escape(Character.toCodePoint((char) pendingHighSurrogate, +- c)); +- if (escaped != null) { +- // Emit the escaped character and adjust +- // unescapedChunkStart to +- // skip the low surrogate we have consumed. +- outputChars(escaped, escaped.length); +- unescapedChunkStart += 1; +- } else { +- // Emit pending high surrogate (unescaped) but do +- // not modify +- // unescapedChunkStart as we must still emit the low +- // surrogate. +- out.append((char) pendingHighSurrogate); +- } +- pendingHighSurrogate = -1; +- } +- while (true) { +- // Find and append the next subsequence of unescaped +- // characters. +- index = nextEscapeIndex(csq, index, end); +- if (index > unescapedChunkStart) { +- out.append(csq, unescapedChunkStart, index); +- } +- if (index == end) { +- break; +- } +- // If we are not finished, calculate the next code +- // point. +- int cp = codePointAt(csq, index, end); +- if (cp < 0) { +- // Our sequence ended half way through a surrogate +- // pair so just +- // record the state and exit. +- pendingHighSurrogate = -cp; +- break; +- } +- // Escape the code point and output the characters. +- char[] escaped = escape(cp); +- if (escaped != null) { +- outputChars(escaped, escaped.length); +- } else { +- // This shouldn't really happen if nextEscapeIndex +- // is correct but +- // we should cope with false positives. +- int len = Character.toChars(cp, decodedChars, 0); +- outputChars(decodedChars, len); +- } +- // Update our index past the escaped character and +- // continue. +- index += (Character.isSupplementaryCodePoint(cp) ? 2 : 1); +- unescapedChunkStart = index; +- } +- } +- return this; +- } +- +- public Appendable append(char c) throws IOException { +- if (pendingHighSurrogate != -1) { +- // Our last append operation ended halfway through a +- // surrogate pair +- // so we have to do some extra work first. +- if (!Character.isLowSurrogate(c)) { +- throw new IllegalArgumentException( +- "Expected low surrogate character but got '" + c + "' with value " +- + (int) c); +- } +- char[] escaped = escape(Character.toCodePoint((char) pendingHighSurrogate, c)); +- if (escaped != null) { +- outputChars(escaped, escaped.length); +- } else { +- out.append((char) pendingHighSurrogate); +- out.append(c); +- } +- pendingHighSurrogate = -1; +- } else if (Character.isHighSurrogate(c)) { +- // This is the start of a (split) surrogate pair. +- pendingHighSurrogate = c; +- } else { +- if (Character.isLowSurrogate(c)) { +- throw new IllegalArgumentException("Unexpected low surrogate character '" +- + c + "' with value " + (int) c); +- } +- // This is a normal (non surrogate) char. +- char[] escaped = escape(c); +- if (escaped != null) { +- outputChars(escaped, escaped.length); +- } else { +- out.append(c); +- } +- } +- return this; +- } +- +- private void outputChars(char[] chars, int len) throws IOException { +- for (int n = 0; n < len; n++) { +- out.append(chars[n]); +- } +- } +- }; +- } +- +- /** +- * Returns the Unicode code point of the character at the given index. +- * +- *

+- * Unlike {@link Character#codePointAt(CharSequence, int)} or +- * {@link String#codePointAt(int)} this method will never fail silently when +- * encountering an invalid surrogate pair. +- * +- *

+- * The behaviour of this method is as follows: +- *

    +- *
  1. If {@code index >= end}, {@link IndexOutOfBoundsException} is thrown. +- *
  2. If the character at the specified index is not a surrogate, it is +- * returned. +- *
  3. If the first character was a high surrogate value, then an attempt is +- * made to read the next character. +- *
      +- *
    1. If the end of the sequence was reached, the negated value of the +- * trailing high surrogate is returned. +- *
    2. If the next character was a valid low surrogate, the code point +- * value of the high/low surrogate pair is returned. +- *
    3. If the next character was not a low surrogate value, then +- * {@link IllegalArgumentException} is thrown. +- *
    +- *
  4. If the first character was a low surrogate value, +- * {@link IllegalArgumentException} is thrown. +- *
+- * +- * @param seq +- * the sequence of characters from which to decode the code point +- * @param index +- * the index of the first character to decode +- * @param end +- * the index beyond the last valid character to decode +- * @return the Unicode code point for the given index or the negated value +- * of the trailing high surrogate character at the end of the +- * sequence +- */ +- protected static final int codePointAt(CharSequence seq, int index, int end) { +- if (index < end) { +- char c1 = seq.charAt(index++); +- if (c1 < Character.MIN_HIGH_SURROGATE || c1 > Character.MAX_LOW_SURROGATE) { +- // Fast path (first test is probably all we need to do) +- return c1; +- } else if (c1 <= Character.MAX_HIGH_SURROGATE) { +- // If the high surrogate was the last character, return its +- // inverse +- if (index == end) { +- return -c1; +- } +- // Otherwise look for the low surrogate following it +- char c2 = seq.charAt(index); +- if (Character.isLowSurrogate(c2)) { +- return Character.toCodePoint(c1, c2); +- } +- throw new IllegalArgumentException("Expected low surrogate but got char '" + c2 +- + "' with value " + (int) c2 + " at index " + index); +- } else { +- throw new IllegalArgumentException("Unexpected low surrogate character '" + c1 +- + "' with value " + (int) c1 + " at index " + (index - 1)); +- } +- } +- throw new IndexOutOfBoundsException("Index exceeds specified range"); +- } +- +- /** +- * Helper method to grow the character buffer as needed, this only happens +- * once in a while so it's ok if it's in a method call. If the index passed +- * in is 0 then no copying will be done. +- */ +- private static final char[] growBuffer(char[] dest, int index, int size) { +- char[] copy = new char[size]; +- if (index > 0) { +- System.arraycopy(dest, 0, copy, 0, index); +- } +- return copy; +- } +- +- /** +- * A thread-local destination buffer to keep us from creating new buffers. +- * The starting size is 1024 characters. If we grow past this we don't put +- * it back in the threadlocal, we just keep going and grow as needed. +- */ +- private static final ThreadLocal DEST_TL = new ThreadLocal() { +- @Override +- protected char[] initialValue() { +- return new char[1024]; +- } +- }; +-} +diff --git a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java +index af30dea..d0fe032 100644 +--- a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java ++++ b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java +@@ -23,25 +23,46 @@ import java.nio.charset.CharacterCodingException; + import java.nio.charset.Charset; + import java.nio.charset.CharsetDecoder; + import java.nio.charset.CodingErrorAction; ++import java.util.BitSet; + ++import org.apache.commons.codec.net.URLCodec; + import org.yaml.snakeyaml.error.YAMLException; +-import org.yaml.snakeyaml.external.com.google.gdata.util.common.base.Escaper; +-import org.yaml.snakeyaml.external.com.google.gdata.util.common.base.PercentEscaper; ++ + + public abstract class UriEncoder { + private static final CharsetDecoder UTF8Decoder = Charset.forName("UTF-8").newDecoder() + .onMalformedInput(CodingErrorAction.REPORT); +- // Include the [] chars to the SAFEPATHCHARS_URLENCODER to avoid +- // its escape as required by spec. See +- // http://yaml.org/spec/1.1/#escaping%20in%20URI/ +- private static final String SAFE_CHARS = PercentEscaper.SAFEPATHCHARS_URLENCODER + "[]/"; +- private static final Escaper escaper = new PercentEscaper(SAFE_CHARS, false); ++ ++ // default safe characters which can appear within URI and shouldn't be escaped ++ private static final BitSet allowedCharacters = new BitSet(256); ++ ++ static { ++ for (int i = 'a'; i <= 'z'; i++) { ++ allowedCharacters.set(i); ++ } ++ for (int i = 'A'; i <= 'Z'; i++) { ++ allowedCharacters.set(i); ++ } ++ for (int i = '0'; i <= '9'; i++) { ++ allowedCharacters.set(i); ++ } ++ // http://yaml.org/spec/1.1/#escaping%20in%20URI/ ++ for (char c : "-_.!~*'()@:$&,;=/[]".toCharArray()) { ++ allowedCharacters.set(c); ++ } ++ } + + /** + * Escape special characters with '%' + */ + public static String encode(String uri) { +- return escaper.escape(uri); ++ try { ++ byte[] rawdata = URLCodec.encodeUrl(allowedCharacters, ++ uri.getBytes("UTF-8")); ++ return new String(rawdata, 0, rawdata.length, "US-ASCII"); ++ } catch (UnsupportedEncodingException e) { ++ throw new YAMLException(e); ++ } + } + + /** +-- +1.8.1.4 + diff --git a/SOURCES/java8-use-linked-hashmap.patch b/SOURCES/java8-use-linked-hashmap.patch new file mode 100644 index 0000000..5e43d07 --- /dev/null +++ b/SOURCES/java8-use-linked-hashmap.patch @@ -0,0 +1,57 @@ +changeset: 1493:0ecfebcf845d +user: maslovalex +date: Thu May 22 09:24:53 2014 +0300 +summary: Using LinkedHashMap in some tests to be sure about keys order in dumped yaml. + +diff -r 1413062d7874 -r 0ecfebcf845d src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java +--- a/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java Wed May 21 16:06:58 2014 +0300 ++++ b/src/test/java/org/yaml/snakeyaml/constructor/ImplicitTagsTest.java Thu May 22 09:24:53 2014 +0300 +@@ -16,6 +16,7 @@ + package org.yaml.snakeyaml.constructor; + + import java.util.HashMap; ++import java.util.LinkedHashMap; + import java.util.List; + import java.util.Map; + +@@ -69,14 +70,16 @@ + + @SuppressWarnings("unchecked") + public void testRootMap() { +- Map car1 = new HashMap(); +- car1.put("plate", "12-XP-F4"); ++ Map car1 = new LinkedHashMap(); + Wheel wheel = new Wheel(); + wheel.setId(2); +- car1.put("wheel", wheel); + Map map = new HashMap(); + map.put("id", 3); ++ ++ car1.put("wheel", wheel); + car1.put("map", map); ++ car1.put("plate", "12-XP-F4"); ++ + String carYaml1 = new Yaml().dump(car1); + assertEquals(Util.getLocalResource("constructor/carwheel-root-map.yaml"), carYaml1); + Map car2 = (Map) new Yaml().load(carYaml1); +diff -r 1413062d7874 -r 0ecfebcf845d src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java +--- a/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java Wed May 21 16:06:58 2014 +0300 ++++ b/src/test/java/org/yaml/snakeyaml/issues/issue61/GenericMapBeanTest.java Thu May 22 09:24:53 2014 +0300 +@@ -16,6 +16,7 @@ + package org.yaml.snakeyaml.issues.issue61; + + import java.util.HashMap; ++import java.util.LinkedHashMap; + import java.util.Map; + + import junit.framework.TestCase; +@@ -68,7 +69,7 @@ + } + + public static class MapProvider { +- private Map map = new HashMap(); ++ private Map map = new LinkedHashMap(); + + public Map getMap() { + return map; + diff --git a/SPECS/snakeyaml.spec b/SPECS/snakeyaml.spec new file mode 100644 index 0000000..b3e5fa6 --- /dev/null +++ b/SPECS/snakeyaml.spec @@ -0,0 +1,196 @@ +%{?scl:%scl_package snakeyaml} +%{!?scl:%global pkg_name %{name}} +%{?java_common_find_provides_and_requires} + +%global vertag 3f1ee79d50cf + +Name: %{?scl_prefix}snakeyaml +Version: 1.13 +Release: 9.2%{?dist} +Summary: YAML parser and emitter for the Java programming language +License: ASL 2.0 +# http://code.google.com/p/snakeyaml +URL: http://code.google.com/p/%{pkg_name} +Source0: https://snakeyaml.googlecode.com/archive/v%{version}.zip#/%{pkg_name}-%{version}.zip + +# Upstream has forked gdata-java and base64 and refuses [1] to +# consider replacing them by external dependencies. Bundled libraries +# need to be removed and their use replaced by system libraries. +# See rhbz#875777 and http://code.google.com/p/snakeyaml/issues/detail?id=175 +# +# Remove use of bundled Base64 implementation +Patch0: 0001-Replace-bundled-base64-implementation.patch +# We don't have gdata-java in Fedora any longer, use commons-codec instead +Patch1: 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch +# Fix tests on Java 8 (can be removed if version > 1.13) +Patch2: java8-use-linked-hashmap.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(asm:asm) +BuildRequires: %{?scl_prefix}mvn(biz.source_code:base64coder) +BuildRequires: %{?scl_prefix}mvn(commons-codec:commons-codec) +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.maven.plugins:maven-site-plugin) +BuildRequires: %{?scl_prefix_maven}mvn(org.apache.maven.plugins:maven-source-plugin) + +%description +SnakeYAML features: + * a complete YAML 1.1 parser. In particular, + SnakeYAML can parse all examples from the specification. + * Unicode support including UTF-8/UTF-16 input/output. + * high-level API for serializing and deserializing + native Java objects. + * support for all types from the YAML types repository. + * relatively sensible error messages. + +%package javadoc +Summary: API documentation for %{pkg_name} + +%description javadoc +This package contains %{summary}. + +%prep +%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"} +%setup -q -n %{pkg_name}-%{vertag} +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + +%mvn_file : %{pkg_name} + +%pom_remove_plugin org.codehaus.mojo:cobertura-maven-plugin +%pom_remove_plugin :maven-changes-plugin +%pom_remove_plugin :maven-license-plugin +%pom_remove_plugin :maven-javadoc-plugin + +sed -i "/spring - 1.13-9.2 +- Changes related to rh-java-common migration + +* Thu Jul 09 2015 Mat Booth - 1.13-9.1 +- Import latest from Fedora + +* Fri Jun 19 2015 Fedora Release Engineering - 1.13-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Apr 21 2015 Mikolaj Izdebski - 1.13-8 +- Remove maven-javadoc-plugin from POM + +* Tue Mar 31 2015 Michael Simacek - 1.13-7 +- Remove BR on maven-changes-plugin + +* Wed Mar 25 2015 Mikolaj Izdebski - 1.13-6 +- Remove build dependency on cobertura + +* Wed Mar 11 2015 Mikolaj Izdebski - 1.13-5 +- Add BR on objectweb-asm3 + +* Wed Jan 21 2015 Mat Booth - 1.13-4 +- Add missing BR on maven-site-plugin + +* Mon Jun 16 2014 Michal Srb - 1.13-3 +- Fix FTBFS + +* Sun Jun 08 2014 Fedora Release Engineering - 1.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Sep 30 2013 Mikolaj Izdebski - 1.13-1 +- Update to upstream version 1.13 + +* Sun Aug 04 2013 Fedora Release Engineering - 1.11-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jun 21 2013 Mikolaj Izdebski - 1.11-6 +- Update to current packaging guidelines + +* Fri Apr 26 2013 Mikolaj Izdebski - 1.11-5 +- Explain gdata-java and base64 bundling situation +- Resolves: rhbz#875777 + +* Mon Apr 22 2013 Michal Srb - 1.11-5 +- Replace bundled base64 implementation +- Replace bundled gdata-java-client classes with apache-commons-codec + +* Wed Apr 10 2013 Mikolaj Izdebski - 1.11-4 +- Conditionally disable tests +- Conditionally remove test dependencies from POM + +* Fri Feb 15 2013 Fedora Release Engineering - 1.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.11-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Mon Oct 15 2012 Mikolaj Izdebski - 1.11-1 +- Update to upstream version 1.11 + +* Mon Oct 15 2012 Mikolaj Izdebski - 1.9-3 +- Remove unneeded dependencies: base64coder, gdata-java +- Convert pom.xml patch to POM macro + +* Sat Jul 21 2012 Fedora Release Engineering - 1.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 20 2012 Mo Morsi - 1.9-1 +- Update to latest upstream release +- patch2, patch3 no longer needed +- update to latest fedora java guidelines + +* Sat Jan 14 2012 Fedora Release Engineering - 1.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Jun 20 2011 Jaromir Capik - 1.8-6 +- Patch for the issue67 test removed + +* Fri Jun 17 2011 Stanislav Ochotnicky - 1.8-5 +- Add osgi metadata to jar file (#713935) + +* Thu Jun 09 2011 Jaromir Capik - 1.8-4 +- File handle leaks patched + +* Tue Jun 07 2011 Jaromir Capik - 1.8-3 +- base64coder-java renamed to base64coder + +* Wed Jun 01 2011 Jaromir Capik - 1.8-2 +- Bundled stuff removal + +* Mon May 16 2011 Jaromir Capik - 1.8-1 +- Initial version of the package