Sync from SUSE:SLFO:Main snakeyaml revision f794fe9fd90e780951aa62e9650216b0
This commit is contained in:
parent
0edc19413c
commit
5bec381a84
@ -1,29 +1,55 @@
|
|||||||
From cdee7ec34fb56a84ae4dc6ccb21d5f07c2392df1 Mon Sep 17 00:00:00 2001
|
From 6519dac7af0b7fed04b3dfeaada0023ea75fa881 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
From: Andrey Somov <public.somov@gmail.com>
|
||||||
Date: Wed, 12 Oct 2022 10:54:38 +0200
|
Date: Sat, 6 Apr 2024 16:56:51 +0400
|
||||||
Subject: [PATCH 1/3] replace bundled base64coder with java.util.Base64
|
Subject: [PATCH 1/2] Remove external Base64Coder and use provided Base64
|
||||||
|
|
||||||
---
|
---
|
||||||
.../constructor/SafeConstructor.java | 4 +-
|
pom.xml | 6 +-
|
||||||
|
.../constructor/SafeConstructor.java | 14 +-
|
||||||
.../external/biz/base64Coder/Base64Coder.java | 281 ------------------
|
.../external/biz/base64Coder/Base64Coder.java | 281 ------------------
|
||||||
.../representer/SafeRepresenter.java | 10 +-
|
.../representer/SafeRepresenter.java | 22 +-
|
||||||
.../base64Coder/Base64CoderTest.java | 16 +-
|
.../base64Coder/Base64CoderTest.java | 17 +-
|
||||||
4 files changed, 14 insertions(+), 297 deletions(-)
|
.../issues/issue99/YamlBase64Test.java | 8 +-
|
||||||
|
6 files changed, 22 insertions(+), 326 deletions(-)
|
||||||
delete mode 100644 src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java
|
delete mode 100644 src/main/java/org/yaml/snakeyaml/external/biz/base64Coder/Base64Coder.java
|
||||||
|
|
||||||
|
diff --git a/pom.xml b/pom.xml
|
||||||
|
index e4b15074..c242d07d 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -10,9 +10,9 @@
|
||||||
|
<project.scm.id>bitbucket</project.scm.id>
|
||||||
|
<release.repo.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</release.repo.url>
|
||||||
|
<snapshot.repo.url>https://oss.sonatype.org/content/repositories/snapshots/</snapshot.repo.url>
|
||||||
|
- <maven.compiler.source>7</maven.compiler.source>
|
||||||
|
- <maven.compiler.target>7</maven.compiler.target>
|
||||||
|
- <maven.compiler.release>7</maven.compiler.release>
|
||||||
|
+ <maven.compiler.source>8</maven.compiler.source>
|
||||||
|
+ <maven.compiler.target>8</maven.compiler.target>
|
||||||
|
+ <maven.compiler.release>8</maven.compiler.release>
|
||||||
|
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
|
||||||
|
<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
|
||||||
|
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version><!-- for Github CI -->
|
||||||
diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
|
diff --git a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
|
||||||
index e124489e..9ec73ccd 100644
|
index e6dcd406..5ddeb13f 100644
|
||||||
--- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
|
--- a/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
|
||||||
+++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
|
+++ b/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java
|
||||||
@@ -15,6 +15,7 @@ package org.yaml.snakeyaml.constructor;
|
@@ -14,21 +14,11 @@
|
||||||
|
package org.yaml.snakeyaml.constructor;
|
||||||
|
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
import java.util.ArrayList;
|
-import java.util.ArrayList;
|
||||||
+import java.util.Base64;
|
-import java.util.Calendar;
|
||||||
import java.util.Calendar;
|
-import java.util.HashMap;
|
||||||
import java.util.HashMap;
|
-import java.util.Iterator;
|
||||||
import java.util.Iterator;
|
-import java.util.LinkedHashMap;
|
||||||
@@ -28,7 +29,6 @@ import java.util.regex.Matcher;
|
-import java.util.List;
|
||||||
|
-import java.util.Map;
|
||||||
|
-import java.util.Set;
|
||||||
|
-import java.util.TimeZone;
|
||||||
|
-import java.util.TreeSet;
|
||||||
|
+import java.util.*;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import org.yaml.snakeyaml.LoaderOptions;
|
import org.yaml.snakeyaml.LoaderOptions;
|
||||||
import org.yaml.snakeyaml.error.YAMLException;
|
import org.yaml.snakeyaml.error.YAMLException;
|
||||||
@ -31,7 +57,7 @@ index e124489e..9ec73ccd 100644
|
|||||||
import org.yaml.snakeyaml.nodes.MappingNode;
|
import org.yaml.snakeyaml.nodes.MappingNode;
|
||||||
import org.yaml.snakeyaml.nodes.Node;
|
import org.yaml.snakeyaml.nodes.Node;
|
||||||
import org.yaml.snakeyaml.nodes.NodeId;
|
import org.yaml.snakeyaml.nodes.NodeId;
|
||||||
@@ -389,7 +389,7 @@ public class SafeConstructor extends BaseConstructor {
|
@@ -386,7 +376,7 @@ public class SafeConstructor extends BaseConstructor {
|
||||||
public Object construct(Node node) {
|
public Object construct(Node node) {
|
||||||
// Ignore white spaces for base64 encoded scalar
|
// Ignore white spaces for base64 encoded scalar
|
||||||
String noWhiteSpaces = constructScalar((ScalarNode) node).replaceAll("\\s", "");
|
String noWhiteSpaces = constructScalar((ScalarNode) node).replaceAll("\\s", "");
|
||||||
@ -328,18 +354,26 @@ index db43b474..00000000
|
|||||||
-
|
-
|
||||||
-} // end class 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
|
diff --git a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
|
||||||
index f0951fb4..fdb5fb8c 100644
|
index 889b573c..d524ea4a 100644
|
||||||
--- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
|
--- a/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
|
||||||
+++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
|
+++ b/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java
|
||||||
@@ -17,6 +17,7 @@ import java.math.BigInteger;
|
@@ -15,22 +15,10 @@ package org.yaml.snakeyaml.representer;
|
||||||
|
|
||||||
|
import java.math.BigInteger;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import java.util.ArrayList;
|
-import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
-import java.util.Arrays;
|
||||||
+import java.util.Base64;
|
-import java.util.Calendar;
|
||||||
import java.util.Calendar;
|
-import java.util.Date;
|
||||||
import java.util.Date;
|
-import java.util.HashMap;
|
||||||
import java.util.HashMap;
|
-import java.util.Iterator;
|
||||||
@@ -30,7 +31,6 @@ import java.util.UUID;
|
-import java.util.LinkedHashMap;
|
||||||
|
-import java.util.List;
|
||||||
|
-import java.util.Map;
|
||||||
|
-import java.util.Set;
|
||||||
|
-import java.util.TimeZone;
|
||||||
|
-import java.util.UUID;
|
||||||
|
+import java.util.*;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
import org.yaml.snakeyaml.DumperOptions;
|
import org.yaml.snakeyaml.DumperOptions;
|
||||||
import org.yaml.snakeyaml.error.YAMLException;
|
import org.yaml.snakeyaml.error.YAMLException;
|
||||||
@ -347,57 +381,49 @@ index f0951fb4..fdb5fb8c 100644
|
|||||||
import org.yaml.snakeyaml.nodes.Node;
|
import org.yaml.snakeyaml.nodes.Node;
|
||||||
import org.yaml.snakeyaml.nodes.Tag;
|
import org.yaml.snakeyaml.nodes.Tag;
|
||||||
import org.yaml.snakeyaml.reader.StreamReader;
|
import org.yaml.snakeyaml.reader.StreamReader;
|
||||||
@@ -124,7 +124,6 @@ class SafeRepresenter extends BaseRepresenter {
|
@@ -127,8 +115,7 @@ class SafeRepresenter extends BaseRepresenter {
|
||||||
if (nonPrintableStyle == DumperOptions.NonPrintableStyle.BINARY
|
|
||||||
&& !StreamReader.isPrintable(value)) {
|
|
||||||
tag = Tag.BINARY;
|
|
||||||
- char[] binary;
|
|
||||||
final byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
|
|
||||||
// sometimes above will just silently fail - it will return incomplete data
|
|
||||||
// it happens when String has invalid code points
|
|
||||||
@@ -133,8 +132,7 @@ class SafeRepresenter extends BaseRepresenter {
|
|
||||||
if (!checkValue.equals(value)) {
|
if (!checkValue.equals(value)) {
|
||||||
throw new YAMLException("invalid string value has occurred");
|
throw new YAMLException("invalid string value has occurred");
|
||||||
}
|
}
|
||||||
- binary = Base64Coder.encode(bytes);
|
- char[] binary = Base64Coder.encode(bytes);
|
||||||
- value = String.valueOf(binary);
|
- value = String.valueOf(binary);
|
||||||
+ value = Base64.getEncoder().encodeToString(bytes);
|
+ value = Base64.getEncoder().encodeToString(bytes);
|
||||||
style = DumperOptions.ScalarStyle.LITERAL;
|
style = DumperOptions.ScalarStyle.LITERAL;
|
||||||
}
|
}
|
||||||
// if no other scalar style is explicitly set, use literal style for
|
// if no other scalar style is explicitly set, use literal style for
|
||||||
@@ -455,8 +453,8 @@ class SafeRepresenter extends BaseRepresenter {
|
@@ -449,8 +436,9 @@ class SafeRepresenter extends BaseRepresenter {
|
||||||
protected class RepresentByteArray implements Represent {
|
protected class RepresentByteArray implements Represent {
|
||||||
|
|
||||||
public Node representData(Object data) {
|
public Node representData(Object data) {
|
||||||
- char[] binary = Base64Coder.encode((byte[]) data);
|
- char[] binary = Base64Coder.encode((byte[]) data);
|
||||||
- return representScalar(Tag.BINARY, String.valueOf(binary), DumperOptions.ScalarStyle.LITERAL);
|
- return representScalar(Tag.BINARY, String.valueOf(binary), DumperOptions.ScalarStyle.LITERAL);
|
||||||
+ String binary = Base64.getEncoder().encodeToString((byte[]) data);
|
+ String encoded = Base64.getEncoder().encodeToString((byte[]) data);
|
||||||
+ return representScalar(Tag.BINARY, binary, DumperOptions.ScalarStyle.LITERAL);
|
+ return representScalar(Tag.BINARY, String.valueOf(encoded),
|
||||||
|
+ DumperOptions.ScalarStyle.LITERAL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
|
diff --git a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
|
||||||
index 295eb729..dbe814bf 100644
|
index 295eb729..1bcf0f6c 100644
|
||||||
--- a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
|
--- a/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
|
||||||
+++ b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
|
+++ b/src/test/java/biz/source_code/base64Coder/Base64CoderTest.java
|
||||||
@@ -13,10 +13,10 @@
|
@@ -15,8 +15,9 @@ package biz.source_code.base64Coder;
|
||||||
*/
|
|
||||||
package biz.source_code.base64Coder;
|
|
||||||
|
|
||||||
+import java.util.Base64;
|
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
+import java.util.Base64;
|
||||||
|
+
|
||||||
import junit.framework.TestCase;
|
import junit.framework.TestCase;
|
||||||
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
|
-import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
|
||||||
|
|
||||||
public class Base64CoderTest extends TestCase {
|
public class Base64CoderTest extends TestCase {
|
||||||
|
|
||||||
@@ -30,10 +30,10 @@ public class Base64CoderTest extends TestCase {
|
@@ -30,10 +31,10 @@ public class Base64CoderTest extends TestCase {
|
||||||
|
|
||||||
public void testFailure1() throws UnsupportedEncodingException {
|
public void testFailure1() throws UnsupportedEncodingException {
|
||||||
try {
|
try {
|
||||||
- Base64Coder.decode("YQ=".toCharArray());
|
- Base64Coder.decode("YQ=".toCharArray());
|
||||||
+ Base64.getDecoder().decode("YQ=".getBytes(StandardCharsets.UTF_8));
|
+ Base64.getDecoder().decode("YQ=");
|
||||||
fail();
|
fail();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
- assertEquals("Length of Base64 encoded input string is not a multiple of 4.", e.getMessage());
|
- assertEquals("Length of Base64 encoded input string is not a multiple of 4.", e.getMessage());
|
||||||
@ -405,13 +431,14 @@ index 295eb729..dbe814bf 100644
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,18 +51,18 @@ public class Base64CoderTest extends TestCase {
|
@@ -51,18 +52,18 @@ public class Base64CoderTest extends TestCase {
|
||||||
|
|
||||||
private void checkInvalid(String encoded) {
|
private void checkInvalid(String encoded) {
|
||||||
try {
|
try {
|
||||||
- Base64Coder.decode(encoded.toCharArray());
|
- Base64Coder.decode(encoded.toCharArray());
|
||||||
+ Base64.getDecoder().decode(encoded.getBytes(StandardCharsets.UTF_8));
|
- fail("Illegal chanracter.");
|
||||||
fail("Illegal chanracter.");
|
+ Base64.getDecoder().decode(encoded);
|
||||||
|
+ fail("Illegal character.");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
- assertEquals("Illegal character in Base64 encoded data.", e.getMessage());
|
- assertEquals("Illegal character in Base64 encoded data.", e.getMessage());
|
||||||
+ assertTrue(e.getMessage().startsWith("Illegal base64 character "));
|
+ assertTrue(e.getMessage().startsWith("Illegal base64 character "));
|
||||||
@ -420,15 +447,65 @@ index 295eb729..dbe814bf 100644
|
|||||||
|
|
||||||
private void check(String text, String encoded) throws UnsupportedEncodingException {
|
private void check(String text, String encoded) throws UnsupportedEncodingException {
|
||||||
- char[] s1 = Base64Coder.encode(text.getBytes(StandardCharsets.UTF_8));
|
- char[] s1 = Base64Coder.encode(text.getBytes(StandardCharsets.UTF_8));
|
||||||
- String t1 = new String(s1);
|
+ byte[] s1 = Base64.getEncoder().encode(text.getBytes());
|
||||||
+ byte[] s1 = Base64.getEncoder().encode(text.getBytes(StandardCharsets.UTF_8));
|
String t1 = new String(s1);
|
||||||
+ String t1 = new String(s1, StandardCharsets.UTF_8);
|
|
||||||
assertEquals(encoded, t1);
|
assertEquals(encoded, t1);
|
||||||
- byte[] s2 = Base64Coder.decode(encoded.toCharArray());
|
- byte[] s2 = Base64Coder.decode(encoded.toCharArray());
|
||||||
+ byte[] s2 = Base64.getDecoder().decode(encoded.getBytes(StandardCharsets.UTF_8));
|
+ byte[] s2 = Base64.getDecoder().decode(encoded);
|
||||||
String t2 = new String(s2, StandardCharsets.UTF_8);
|
String t2 = new String(s2, StandardCharsets.UTF_8);
|
||||||
assertEquals(text, t2);
|
assertEquals(text, t2);
|
||||||
}
|
}
|
||||||
--
|
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
|
||||||
2.37.3
|
index d1fe1f67..220f995e 100644
|
||||||
|
--- a/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
|
||||||
|
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
|
||||||
|
@@ -16,6 +16,7 @@ package org.yaml.snakeyaml.issues.issue99;
|
||||||
|
import java.io.BufferedInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
+import java.util.Base64;
|
||||||
|
import java.util.Map;
|
||||||
|
import junit.framework.TestCase;
|
||||||
|
import org.yaml.snakeyaml.LoaderOptions;
|
||||||
|
@@ -24,7 +25,6 @@ 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;
|
||||||
|
@@ -47,12 +47,11 @@ public class YamlBase64Test extends TestCase {
|
||||||
|
all = all + lines[i].trim();
|
||||||
|
}
|
||||||
|
// System.out.println(all);
|
||||||
|
- byte[] decoded = Base64Coder.decode(all.toCharArray());
|
||||||
|
+ byte[] decoded = Base64.getDecoder().decode(all);
|
||||||
|
assertEquals(3737, decoded.length);
|
||||||
|
checkBytes(decoded);
|
||||||
|
}
|
||||||
|
|
||||||
|
- @SuppressWarnings("unchecked")
|
||||||
|
public void testYamlBase64Loading() throws IOException {
|
||||||
|
Yaml yaml = new Yaml();
|
||||||
|
InputStream inputStream =
|
||||||
|
@@ -122,7 +121,7 @@ public class YamlBase64Test extends TestCase {
|
||||||
|
public Object construct(Node node) {
|
||||||
|
String contentWithNewLines = constructScalar((ScalarNode) node);
|
||||||
|
String noNewLines = contentWithNewLines.replaceAll("\\s", "");
|
||||||
|
- byte[] decoded = Base64Coder.decode(noNewLines.toCharArray());
|
||||||
|
+ byte[] decoded = Base64.getDecoder().decode(noNewLines);
|
||||||
|
return decoded;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -131,7 +130,6 @@ public class YamlBase64Test extends TestCase {
|
||||||
|
/**
|
||||||
|
* Define a local tag to ignore all the white spaces to be able to use literal scalar
|
||||||
|
*/
|
||||||
|
- @SuppressWarnings("unchecked")
|
||||||
|
public void testLocalBinaryTag() throws IOException {
|
||||||
|
Yaml yaml = new Yaml(new SpecialContructor(new Tag("!beautiful")));
|
||||||
|
InputStream inputStream =
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
||||||
@ -1,15 +1,902 @@
|
|||||||
From fe0ce4764ce3839f8019a2b0ecfc1d41c87595c6 Mon Sep 17 00:00:00 2001
|
From 6fc77c07c4a307063601c00869b03688bb4978b5 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
From: Michal Srb <msrb@redhat.com>
|
||||||
Date: Wed, 12 Oct 2022 10:58:47 +0200
|
Date: Mon, 15 Apr 2024 10:08:26 +0200
|
||||||
Subject: [PATCH 2/3] Replace bundled gdata-java-client classes with
|
Subject: [PATCH 2/2] Replace bundled gdata-java-client classes with
|
||||||
commons-codec
|
commons-codec
|
||||||
|
|
||||||
---
|
---
|
||||||
.../org/yaml/snakeyaml/util/UriEncoder.java | 37 +++++++++++++++----
|
pom.xml | 24 +
|
||||||
1 file changed, 29 insertions(+), 8 deletions(-)
|
.../gdata/util/common/base/Escaper.java | 82 ----
|
||||||
|
.../util/common/base/PercentEscaper.java | 267 ----------
|
||||||
|
.../util/common/base/UnicodeEscaper.java | 462 ------------------
|
||||||
|
.../org/yaml/snakeyaml/util/UriEncoder.java | 36 +-
|
||||||
|
.../issue318/ContextClassLoaderTest.java | 20 +-
|
||||||
|
.../issues/issue318/classpath.properties | 1 +
|
||||||
|
7 files changed, 72 insertions(+), 820 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/pom.xml b/pom.xml
|
||||||
|
index c242d07d..938712ea 100644
|
||||||
|
--- a/pom.xml
|
||||||
|
+++ b/pom.xml
|
||||||
|
@@ -15,6 +15,7 @@
|
||||||
|
<maven.compiler.release>8</maven.compiler.release>
|
||||||
|
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
|
||||||
|
<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
|
||||||
|
+ <maven-dependency-plugin.version>3.6.0</maven-dependency-plugin.version>
|
||||||
|
<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version><!-- for Github CI -->
|
||||||
|
<maven-site-plugin.version>3.12.1</maven-site-plugin.version>
|
||||||
|
<maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
|
||||||
|
@@ -60,6 +61,11 @@
|
||||||
|
</developer>
|
||||||
|
</developers>
|
||||||
|
<dependencies>
|
||||||
|
+ <dependency>
|
||||||
|
+ <groupId>commons-codec</groupId>
|
||||||
|
+ <artifactId>commons-codec</artifactId>
|
||||||
|
+ <version>1.16.1</version>
|
||||||
|
+ </dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>junit</groupId>
|
||||||
|
<artifactId>junit</artifactId>
|
||||||
|
@@ -369,6 +375,24 @@
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.apache.maven.plugins</groupId>
|
||||||
|
+ <artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
+ <version>${maven-dependency-plugin.version}</version>
|
||||||
|
+ <executions>
|
||||||
|
+ <execution>
|
||||||
|
+ <id>build-classpath</id>
|
||||||
|
+ <phase>generate-test-resources</phase>
|
||||||
|
+ <goals>
|
||||||
|
+ <goal>build-classpath</goal>
|
||||||
|
+ </goals>
|
||||||
|
+ <configuration>
|
||||||
|
+ <outputProperty>runtime.classpath</outputProperty>
|
||||||
|
+ <includeScope>runtime</includeScope>
|
||||||
|
+ </configuration>
|
||||||
|
+ </execution>
|
||||||
|
+ </executions>
|
||||||
|
+ </plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
<reporting>
|
||||||
|
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 a94f6154..00000000
|
||||||
|
--- a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/Escaper.java
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,82 +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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * For example, an XML escaper would convert the literal string {@code "Foo<Bar>"} into
|
||||||
|
- * {@code "Foo<Bar>"} to prevent {@code "<Bar>"} 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<Bar>"}.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * An {@code Escaper} instance is required to be stateless, and safe when used concurrently by
|
||||||
|
- * multiple threads.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * Note that this method may treat input characters differently depending on the specific escaper
|
||||||
|
- * implementation.
|
||||||
|
- * <ul>
|
||||||
|
- * <li>{@link UnicodeEscaper} handles <a href="http://en.wikipedia.org/wiki/UTF-16">UTF-16</a>
|
||||||
|
- * correctly, including surrogate character pairs. If the input is badly formed the escaper should
|
||||||
|
- * throw {@link IllegalArgumentException}.
|
||||||
|
- * <li>{@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).
|
||||||
|
- * </ul>
|
||||||
|
- *
|
||||||
|
- * @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
|
||||||
|
- */
|
||||||
|
- 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}.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * Note that this method may treat input characters differently depending on the specific escaper
|
||||||
|
- * implementation.
|
||||||
|
- * <ul>
|
||||||
|
- * <li>{@link UnicodeEscaper} handles <a href="http://en.wikipedia.org/wiki/UTF-16">UTF-16</a>
|
||||||
|
- * correctly, including surrogate character pairs. If the input is badly formed the escaper should
|
||||||
|
- * throw {@link IllegalArgumentException}.
|
||||||
|
- * <li>{@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).
|
||||||
|
- * </ul>
|
||||||
|
- *
|
||||||
|
- * @param out the underlying {@code Appendable} to append escaped output to
|
||||||
|
- * @return an {@code Appendable} which passes text to {@code out} after escaping it.
|
||||||
|
- */
|
||||||
|
- 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 f115a2cc..00000000
|
||||||
|
--- a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/PercentEscaper.java
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,267 +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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * For details on escaping URIs for use in web pages, see section 2.4 of
|
||||||
|
- * <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</a>.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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)}.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * When encoding a String, the following rules apply:
|
||||||
|
- * <ul>
|
||||||
|
- * <li>The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain the
|
||||||
|
- * same.
|
||||||
|
- * <li>Any additionally specified safe characters remain the same.
|
||||||
|
- * <li>If {@code plusForSpace} was specified, the space character " " is converted into a plus sign
|
||||||
|
- * "+".
|
||||||
|
- * <li>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.
|
||||||
|
- * </ul>
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * RFC 2396 specifies the set of unreserved characters as "-", "_", ".", "!", "~", "*", "'", "(" and
|
||||||
|
- * ")". It goes on to state:
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * <i>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.</i>
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * For performance reasons the only currently supported character encoding of this class is UTF-8.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * <b>Note</b>: This escaper produces uppercase hexidecimal sequences. From
|
||||||
|
- * <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</a>:<br>
|
||||||
|
- * <i>"URI producers and normalizers should use uppercase hexadecimal digits for all
|
||||||
|
- * percent-encodings."</i>
|
||||||
|
- */
|
||||||
|
-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 00230df8..00000000
|
||||||
|
--- a/src/main/java/org/yaml/snakeyaml/external/com/google/gdata/util/common/base/UnicodeEscaper.java
|
||||||
|
+++ /dev/null
|
||||||
|
@@ -1,462 +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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * For example, an XML escaper would convert the literal string {@code "Foo<Bar>"} into
|
||||||
|
- * {@code "Foo<Bar>"} to prevent {@code "<Bar>"} 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<Bar>"}.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * <b>Note:</b> This class is similar to {@link CharEscaper} but with one very important difference.
|
||||||
|
- * A CharEscaper can only process Java <a href="http://en.wikipedia.org/wiki/UTF-16">UTF16</a>
|
||||||
|
- * characters in isolation and may not cope when it encounters surrogate pairs. This class
|
||||||
|
- * facilitates the correct escaping of all Unicode characters.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * A {@code UnicodeEscaper} instance is required to be stateless, and safe when used concurrently by
|
||||||
|
- * multiple threads.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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}.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * If an empty array is returned, this effectively strips the input character from the resulting
|
||||||
|
- * text.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * <b>Note:</b> 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)}.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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 <a href="http://en.wikipedia.org/wiki/UTF-16">UTF-16</a> before calling this method or
|
||||||
|
- * use an escaped {@link Appendable} (as returned by {@link #escape(Appendable)}) which can cope
|
||||||
|
- * with arbitrarily split input.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * <b>Note:</b> 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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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}.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * 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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * The methods of the returned object will propagate any exceptions thrown by the underlying
|
||||||
|
- * {@code Appendable}.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * For well formed <a href="http://en.wikipedia.org/wiki/UTF-16">UTF-16</a> 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)}:
|
||||||
|
- *
|
||||||
|
- * <pre>
|
||||||
|
- * {
|
||||||
|
- * @code
|
||||||
|
- * StringBuilder sb = new StringBuilder();
|
||||||
|
- * escaper.escape(sb).append(string);
|
||||||
|
- * return sb.toString();
|
||||||
|
- * }
|
||||||
|
- * </pre>
|
||||||
|
- *
|
||||||
|
- * @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;
|
||||||
|
- final 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.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * Unlike {@link Character#codePointAt(CharSequence, int)} or {@link String#codePointAt(int)} this
|
||||||
|
- * method will never fail silently when encountering an invalid surrogate pair.
|
||||||
|
- *
|
||||||
|
- * <p>
|
||||||
|
- * The behaviour of this method is as follows:
|
||||||
|
- * <ol>
|
||||||
|
- * <li>If {@code index >= end}, {@link IndexOutOfBoundsException} is thrown.
|
||||||
|
- * <li><b>If the character at the specified index is not a surrogate, it is returned.</b>
|
||||||
|
- * <li>If the first character was a high surrogate value, then an attempt is made to read the next
|
||||||
|
- * character.
|
||||||
|
- * <ol>
|
||||||
|
- * <li><b>If the end of the sequence was reached, the negated value of the trailing high surrogate
|
||||||
|
- * is returned.</b>
|
||||||
|
- * <li><b>If the next character was a valid low surrogate, the code point value of the high/low
|
||||||
|
- * surrogate pair is returned.</b>
|
||||||
|
- * <li>If the next character was not a low surrogate value, then {@link IllegalArgumentException}
|
||||||
|
- * is thrown.
|
||||||
|
- * </ol>
|
||||||
|
- * <li>If the first character was a low surrogate value, {@link IllegalArgumentException} is
|
||||||
|
- * thrown.
|
||||||
|
- * </ol>
|
||||||
|
- *
|
||||||
|
- * @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<char[]> DEST_TL = new ThreadLocal<char[]>() {
|
||||||
|
- @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
|
diff --git a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
|
||||||
index 02c3e434..f6b5a639 100644
|
index 02c3e434..69fdc55d 100644
|
||||||
--- a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
|
--- a/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
|
||||||
+++ b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
|
+++ b/src/main/java/org/yaml/snakeyaml/util/UriEncoder.java
|
||||||
@@ -22,18 +22,33 @@ import java.nio.charset.CharsetDecoder;
|
@@ -22,18 +22,33 @@ import java.nio.charset.CharsetDecoder;
|
||||||
@ -53,14 +940,13 @@ index 02c3e434..f6b5a639 100644
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Escape special characters with '%'
|
* Escape special characters with '%'
|
||||||
@@ -42,7 +57,13 @@ public abstract class UriEncoder {
|
@@ -42,7 +57,12 @@ public abstract class UriEncoder {
|
||||||
* @return encoded URI
|
* @return encoded URI
|
||||||
*/
|
*/
|
||||||
public static String encode(String uri) {
|
public static String encode(String uri) {
|
||||||
- return escaper.escape(uri);
|
- return escaper.escape(uri);
|
||||||
+ try {
|
+ try {
|
||||||
+ byte[] rawdata = URLCodec.encodeUrl(allowedCharacters,
|
+ byte[] rawdata = URLCodec.encodeUrl(allowedCharacters, uri.getBytes("UTF-8"));
|
||||||
+ uri.getBytes("UTF-8"));
|
|
||||||
+ return new String(rawdata, 0, rawdata.length, "US-ASCII");
|
+ return new String(rawdata, 0, rawdata.length, "US-ASCII");
|
||||||
+ } catch (UnsupportedEncodingException e) {
|
+ } catch (UnsupportedEncodingException e) {
|
||||||
+ throw new YAMLException(e);
|
+ throw new YAMLException(e);
|
||||||
@ -68,6 +954,62 @@ index 02c3e434..f6b5a639 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
--
|
diff --git a/src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java b/src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
|
||||||
2.37.3
|
index 7d816c07..d4ab48cb 100644
|
||||||
|
--- a/src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
|
||||||
|
+++ b/src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
|
||||||
|
@@ -76,6 +76,7 @@ public class ContextClassLoaderTest {
|
||||||
|
|
||||||
|
private URLClassLoader yamlCL;
|
||||||
|
private URLClassLoader testYamlCL;
|
||||||
|
+ private URLClassLoader depsCL = null;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void before() throws MalformedURLException {
|
||||||
|
@@ -87,10 +88,17 @@ public class ContextClassLoaderTest {
|
||||||
|
fail(e2.getLocalizedMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
+ String runtimeClasspath = classpath.getProperty("runtime_classpath");
|
||||||
|
+ String[] classpathEntries = runtimeClasspath.split(File.pathSeparator);
|
||||||
|
+ for (String classpathEntry : classpathEntries) {
|
||||||
|
+ File file = new File(classpathEntry);
|
||||||
|
+ depsCL = new URLClassLoader(new URL[] {file.toURI().toURL()}, depsCL);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
File runtimeClassesDir = new File(classpath.getProperty("runtime_classes_dir"));
|
||||||
|
File testClassesDir = new File(classpath.getProperty("test_classes_dir"));
|
||||||
|
|
||||||
|
- yamlCL = new URLClassLoader(new URL[] {runtimeClassesDir.toURI().toURL()}, null);
|
||||||
|
+ yamlCL = new URLClassLoader(new URL[] {runtimeClassesDir.toURI().toURL()}, depsCL);
|
||||||
|
testYamlCL = new URLClassLoader(new URL[] {testClassesDir.toURI().toURL()}, yamlCL);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -115,6 +123,16 @@ public class ContextClassLoaderTest {
|
||||||
|
yamlCL = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ if (depsCL != null) {
|
||||||
|
+ try {
|
||||||
|
+ depsCL.close();
|
||||||
|
+ } catch (IOException e) {
|
||||||
|
+ e.printStackTrace();
|
||||||
|
+ } finally {
|
||||||
|
+ depsCL = null;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(expected = ClassNotFoundException.class)
|
||||||
|
diff --git a/src/test/resources/org/yaml/snakeyaml/issues/issue318/classpath.properties b/src/test/resources/org/yaml/snakeyaml/issues/issue318/classpath.properties
|
||||||
|
index a0ee78cf..b8b86b4b 100644
|
||||||
|
--- a/src/test/resources/org/yaml/snakeyaml/issues/issue318/classpath.properties
|
||||||
|
+++ b/src/test/resources/org/yaml/snakeyaml/issues/issue318/classpath.properties
|
||||||
|
@@ -1,2 +1,3 @@
|
||||||
|
runtime_classes_dir=${project.build.outputDirectory}
|
||||||
|
test_classes_dir=${project.build.testOutputDirectory}
|
||||||
|
+runtime_classpath=${runtime.classpath}
|
||||||
|
--
|
||||||
|
2.44.0
|
||||||
|
|
||||||
|
|||||||
@ -1,58 +0,0 @@
|
|||||||
From 6690e47dfc0d46b4923a5b2c55279782b95a335a Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
|
||||||
Date: Wed, 12 Oct 2022 11:05:10 +0200
|
|
||||||
Subject: [PATCH 3/3] Fix ReaderBomTest
|
|
||||||
|
|
||||||
---
|
|
||||||
.../yaml/snakeyaml/reader/ReaderBomTest.java | 37 -------------------
|
|
||||||
1 file changed, 37 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
|
|
||||||
index c7396c2c..375bb756 100644
|
|
||||||
--- a/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
|
|
||||||
+++ b/src/test/java/org/yaml/snakeyaml/reader/ReaderBomTest.java
|
|
||||||
@@ -77,41 +77,4 @@ public class ReaderBomTest extends TestCase {
|
|
||||||
input.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
- public void testUnicodeLeBom() throws IOException {
|
|
||||||
- File file = new File("src/test/resources/reader/unicode-16le.txt");
|
|
||||||
- assertTrue("Test file not found: " + file.getAbsolutePath(), file.exists());
|
|
||||||
- InputStream input = new FileInputStream(file);
|
|
||||||
- UnicodeReader unicodeReader = new UnicodeReader(input);
|
|
||||||
- StreamReader reader = new StreamReader(unicodeReader);
|
|
||||||
- assertEquals('t', reader.peek());
|
|
||||||
- reader.forward(1);
|
|
||||||
- assertEquals('e', reader.peek());
|
|
||||||
- reader.forward(1);
|
|
||||||
- assertEquals('s', reader.peek());
|
|
||||||
- reader.forward(1);
|
|
||||||
- assertEquals('t', reader.peek());
|
|
||||||
- reader.forward(1);
|
|
||||||
- assertEquals('\u0000', reader.peek());
|
|
||||||
- assertEquals(StandardCharsets.UTF_16LE, Charset.forName(unicodeReader.getEncoding()));
|
|
||||||
- input.close();
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- public void testUnicodeBeBom() throws IOException {
|
|
||||||
- File file = new File("src/test/resources/reader/unicode-16be.txt");
|
|
||||||
- assertTrue("Test file not found: " + file.getAbsolutePath(), file.exists());
|
|
||||||
- InputStream input = new FileInputStream(file);
|
|
||||||
- UnicodeReader unicodeReader = new UnicodeReader(input);
|
|
||||||
- StreamReader reader = new StreamReader(unicodeReader);
|
|
||||||
- assertEquals('t', reader.peek());
|
|
||||||
- reader.forward(1);
|
|
||||||
- assertEquals('e', reader.peek());
|
|
||||||
- reader.forward(1);
|
|
||||||
- assertEquals('s', reader.peek());
|
|
||||||
- reader.forward(1);
|
|
||||||
- assertEquals('t', reader.peek());
|
|
||||||
- reader.forward(1);
|
|
||||||
- assertEquals('\u0000', reader.peek());
|
|
||||||
- assertEquals(StandardCharsets.UTF_16BE, Charset.forName(unicodeReader.getEncoding()));
|
|
||||||
- input.close();
|
|
||||||
- }
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.37.3
|
|
||||||
|
|
||||||
BIN
snakeyaml-1.33.tar.bz2
(Stored with Git LFS)
BIN
snakeyaml-1.33.tar.bz2
(Stored with Git LFS)
Binary file not shown.
BIN
snakeyaml-2.2.tar.bz2
(Stored with Git LFS)
Normal file
BIN
snakeyaml-2.2.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -12,21 +12,21 @@
|
|||||||
<property name="project.description" value="YAML 1.1 parser and emitter for Java"/>
|
<property name="project.description" value="YAML 1.1 parser and emitter for Java"/>
|
||||||
<property name="project.groupId" value="org.yaml"/>
|
<property name="project.groupId" value="org.yaml"/>
|
||||||
<property name="project.artifactId" value="snakeyaml"/>
|
<property name="project.artifactId" value="snakeyaml"/>
|
||||||
<property name="project.version" value="1.33"/>
|
<property name="project.version" value="2.2"/>
|
||||||
<property name="bundle.version" value="${project.version}.0"/>
|
<property name="bundle.version" value="${project.version}.0"/>
|
||||||
|
|
||||||
<property name="compiler.source" value="1.8"/>
|
<property name="compiler.release" value="8"/>
|
||||||
|
<property name="compiler.source" value="1.${compiler.release}"/>
|
||||||
<property name="compiler.target" value="${compiler.source}"/>
|
<property name="compiler.target" value="${compiler.source}"/>
|
||||||
|
|
||||||
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
|
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
|
||||||
<property name="build.dir" value="target"/>
|
<property name="build.dir" value="target"/>
|
||||||
<property name="build.outputDir" value="${build.dir}/classes"/>
|
<property name="build.outputDir" value="${build.dir}/classes"/>
|
||||||
|
<property name="build.outputDirJava9" value="${build.outputDir}/META-INF/versions/9"/>
|
||||||
<property name="build.srcDir" value="src/main/java"/>
|
<property name="build.srcDir" value="src/main/java"/>
|
||||||
|
<property name="build.srcDirJava9" value="src/main/java9"/>
|
||||||
<property name="build.resourceDir" value="src/main/resources"/>
|
<property name="build.resourceDir" value="src/main/resources"/>
|
||||||
<property name="build.testOutputDir" value="${build.dir}/test-classes"/>
|
|
||||||
<property name="build.testDir" value="src/test/java"/>
|
|
||||||
<property name="build.testResourceDir" value="src/test/resources"/>
|
|
||||||
<property name="test.reports" value="${build.dir}/test-reports"/>
|
|
||||||
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
|
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
<!-- ====================================================================== -->
|
||||||
@ -35,17 +35,9 @@
|
|||||||
|
|
||||||
<path id="build.classpath">
|
<path id="build.classpath">
|
||||||
<fileset dir="lib">
|
<fileset dir="lib">
|
||||||
<!-- base64coder commons-codec -->
|
|
||||||
<include name="**/*"/>
|
<include name="**/*"/>
|
||||||
</fileset>
|
</fileset>
|
||||||
</path>
|
</path>
|
||||||
<path id="build.test.classpath">
|
|
||||||
<!-- base64coder commons-codec junit hamcrest-core velocity
|
|
||||||
commons-collections commons-lang oro joda-time -->
|
|
||||||
<fileset dir="lib">
|
|
||||||
<include name="**/*.jar"/>
|
|
||||||
</fileset>
|
|
||||||
</path>
|
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
<!-- ====================================================================== -->
|
||||||
<!-- Cleaning up target -->
|
<!-- Cleaning up target -->
|
||||||
@ -62,9 +54,9 @@
|
|||||||
<target name="compile" description="Compile the code">
|
<target name="compile" description="Compile the code">
|
||||||
<mkdir dir="${build.outputDir}"/>
|
<mkdir dir="${build.outputDir}"/>
|
||||||
<javac destdir="${build.outputDir}"
|
<javac destdir="${build.outputDir}"
|
||||||
encoding="UTF-8"
|
|
||||||
nowarn="false"
|
nowarn="false"
|
||||||
debug="true"
|
debug="true"
|
||||||
|
encoding="utf-8"
|
||||||
optimize="false"
|
optimize="false"
|
||||||
deprecation="true"
|
deprecation="true"
|
||||||
target="${compiler.target}"
|
target="${compiler.target}"
|
||||||
@ -76,21 +68,12 @@
|
|||||||
</src>
|
</src>
|
||||||
<classpath refid="build.classpath"/>
|
<classpath refid="build.classpath"/>
|
||||||
</javac>
|
</javac>
|
||||||
</target>
|
<mkdir dir="${build.outputDirJava9}"/>
|
||||||
|
<!-- All java9 files without the module-info.java -->
|
||||||
<!-- ====================================================================== -->
|
<javac destdir="${build.outputDirJava9}"
|
||||||
<!-- Test-compilation target -->
|
|
||||||
<!-- ====================================================================== -->
|
|
||||||
|
|
||||||
<target name="compile-tests"
|
|
||||||
depends="compile"
|
|
||||||
description="Compile the test code"
|
|
||||||
unless="test.skip">
|
|
||||||
<mkdir dir="${build.testOutputDir}"/>
|
|
||||||
<javac destdir="${build.testOutputDir}"
|
|
||||||
encoding="UTF-8"
|
|
||||||
nowarn="false"
|
nowarn="false"
|
||||||
debug="true"
|
debug="true"
|
||||||
|
encoding="utf-8"
|
||||||
optimize="false"
|
optimize="false"
|
||||||
deprecation="true"
|
deprecation="true"
|
||||||
target="${compiler.target}"
|
target="${compiler.target}"
|
||||||
@ -98,85 +81,36 @@
|
|||||||
fork="false"
|
fork="false"
|
||||||
source="${compiler.source}">
|
source="${compiler.source}">
|
||||||
<src>
|
<src>
|
||||||
<pathelement location="${build.testDir}"/>
|
<pathelement location="${build.srcDirJava9}"/>
|
||||||
</src>
|
</src>
|
||||||
|
<exclude name="**/module-info.java"/>
|
||||||
<classpath>
|
<classpath>
|
||||||
<path refid="build.test.classpath"/>
|
<path refid="build.classpath"/>
|
||||||
<pathelement location="${build.outputDir}"/>
|
<pathelement location="${build.outputDir}"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
</javac>
|
</javac>
|
||||||
<copy todir="${build.testOutputDir}">
|
<!-- Special compilation of module-info.java that needs modulepath -->
|
||||||
<fileset dir="${build.testResourceDir}"/>
|
<javac destdir="${build.outputDirJava9}"
|
||||||
</copy>
|
nowarn="false"
|
||||||
</target>
|
debug="true"
|
||||||
|
encoding="utf-8"
|
||||||
<!-- ====================================================================== -->
|
optimize="false"
|
||||||
<!-- Run all tests -->
|
deprecation="true"
|
||||||
<!-- ====================================================================== -->
|
target="9"
|
||||||
|
verbose="false"
|
||||||
<target name="test"
|
fork="false"
|
||||||
depends="compile-tests, junit-missing"
|
source="9">
|
||||||
unless="junit.skipped"
|
<src>
|
||||||
description="Run the test cases">
|
<pathelement location="${build.srcDirJava9}"/>
|
||||||
<mkdir dir="${test.reports}"/>
|
<pathelement location="${build.srcDir}"/>
|
||||||
<junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
|
</src>
|
||||||
<sysproperty key="basedir" value="."/>
|
<include name="**/module-info.java"/>
|
||||||
<env key="EnvironmentKey1" value="EnvironmentValue1"/>
|
<modulepath>
|
||||||
<env key="EnvironmentEmpty" value=""/>
|
<path refid="build.classpath"/>
|
||||||
<formatter type="xml"/>
|
<pathelement location="${build.outputDirJava9}"/>
|
||||||
<formatter type="plain" usefile="false"/>
|
|
||||||
<classpath>
|
|
||||||
<path refid="build.test.classpath"/>
|
|
||||||
<pathelement location="${build.outputDir}"/>
|
<pathelement location="${build.outputDir}"/>
|
||||||
<pathelement location="${build.testOutputDir}"/>
|
</modulepath>
|
||||||
</classpath>
|
</javac>
|
||||||
<batchtest todir="${test.reports}" unless="test">
|
|
||||||
<fileset dir="${build.testDir}">
|
|
||||||
<include name="**/*Test.java"/>
|
|
||||||
<exclude name="**/StressTest.java"/>
|
|
||||||
<exclude name="**/ParallelTest.java"/>
|
|
||||||
<exclude name="**/PyImportTest.java"/>
|
|
||||||
<exclude name="**/AbstractTest.java"/>
|
|
||||||
</fileset>
|
|
||||||
</batchtest>
|
|
||||||
<batchtest todir="${test.reports}" if="test">
|
|
||||||
<fileset dir="${build.testDir}">
|
|
||||||
<include name="**/${test}.java"/>
|
|
||||||
<exclude name="**/StressTest.java"/>
|
|
||||||
<exclude name="**/ParallelTest.java"/>
|
|
||||||
<exclude name="**/PyImportTest.java"/>
|
|
||||||
<exclude name="**/AbstractTest.java"/>
|
|
||||||
</fileset>
|
|
||||||
</batchtest>
|
|
||||||
</junit>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="test-junit-present">
|
|
||||||
<available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="test-junit-status"
|
|
||||||
depends="test-junit-present">
|
|
||||||
<condition property="junit.missing">
|
|
||||||
<and>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<isfalse value="${test.skip}"/>
|
|
||||||
</and>
|
|
||||||
</condition>
|
|
||||||
<condition property="junit.skipped">
|
|
||||||
<or>
|
|
||||||
<isfalse value="${junit.present}"/>
|
|
||||||
<istrue value="${test.skip}"/>
|
|
||||||
</or>
|
|
||||||
</condition>
|
|
||||||
</target>
|
|
||||||
|
|
||||||
<target name="junit-missing"
|
|
||||||
depends="test-junit-status"
|
|
||||||
if="junit.missing">
|
|
||||||
<echo>=================================== WARNING ===================================</echo>
|
|
||||||
<echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
|
|
||||||
<echo>===============================================================================</echo>
|
|
||||||
</target>
|
</target>
|
||||||
|
|
||||||
<!-- ====================================================================== -->
|
<!-- ====================================================================== -->
|
||||||
@ -213,7 +147,7 @@
|
|||||||
<!-- Package target -->
|
<!-- Package target -->
|
||||||
<!-- ====================================================================== -->
|
<!-- ====================================================================== -->
|
||||||
|
|
||||||
<target name="package" depends="compile,test" description="Package the application">
|
<target name="package" depends="compile" description="Package the application">
|
||||||
<jar jarfile="${build.dir}/${build.finalName}.jar"
|
<jar jarfile="${build.dir}/${build.finalName}.jar"
|
||||||
compress="true"
|
compress="true"
|
||||||
index="false"
|
index="false"
|
||||||
@ -224,14 +158,13 @@
|
|||||||
<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
|
<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
|
||||||
<attribute name="Bundle-ManifestVersion" value="2"/>
|
<attribute name="Bundle-ManifestVersion" value="2"/>
|
||||||
<attribute name="Bundle-Name" value="${project.name}"/>
|
<attribute name="Bundle-Name" value="${project.name}"/>
|
||||||
<attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.5"/>
|
|
||||||
<attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/>
|
<attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/>
|
||||||
<attribute name="Bundle-Version" value="${bundle.version}"/>
|
<attribute name="Bundle-Version" value="${bundle.version}"/>
|
||||||
<attribute name="Export-Package" value="org.yaml.snakeyaml;version="${project.version}",org.yaml.snakeyaml.composer;version="${project.version}",org.yaml.snakeyaml.constructor;version="${project.version}",org.yaml.snakeyaml.emitter;version="${project.version}",org.yaml.snakeyaml.error;version="${project.version}",org.yaml.snakeyaml.events;version="${project.version}",org.yaml.snakeyaml.extensions.compactnotation;version="${project.version}",org.yaml.snakeyaml.introspector;version="${project.version}",org.yaml.snakeyaml.nodes;version="${project.version}",org.yaml.snakeyaml.parser;version="${project.version}",org.yaml.snakeyaml.reader;version="${project.version}",org.yaml.snakeyaml.representer;version="${project.version}",org.yaml.snakeyaml.resolver;version="${project.version}",org.yaml.snakeyaml.scanner;version="${project.version}",org.yaml.snakeyaml.serializer;version="${project.version}",org.yaml.snakeyaml.tokens;version="${project.version}",org.yaml.snakeyaml.util;version="${project.version}""/>
|
<attribute name="Export-Package" value="org.yaml.snakeyaml.comments;version="${project.version}",org.yaml.snakeyaml.composer;version="${project.version}",org.yaml.snakeyaml.constructor;version="${project.version}",org.yaml.snakeyaml.emitter;version="${project.version}",org.yaml.snakeyaml.env;version="${project.version}",org.yaml.snakeyaml.error;version="${project.version}",org.yaml.snakeyaml.events;version="${project.version}",org.yaml.snakeyaml.extensions.compactnotation;version="${project.version}",org.yaml.snakeyaml.inspector;version="${project.version}",org.yaml.snakeyaml.internal;version="${project.version}",org.yaml.snakeyaml.introspector;version="${project.version}",org.yaml.snakeyaml.nodes;version="${project.version}",org.yaml.snakeyaml.parser;version="${project.version}",org.yaml.snakeyaml.reader;version="${project.version}",org.yaml.snakeyaml.representer;version="${project.version}",org.yaml.snakeyaml.resolver;version="${project.version}",org.yaml.snakeyaml.scanner;version="${project.version}",org.yaml.snakeyaml.serializer;version="${project.version}",org.yaml.snakeyaml.tokens;version="${project.version}",org.yaml.snakeyaml.util;version="${project.version}",org.yaml.snakeyaml;version="${project.version}""/>
|
||||||
<attribute name="Import-Package" value="biz.source_code.base64Coder;version="[1.0,2)",org.apache.commons.codec.net;version="[1.11,2)",org.yaml.snakeyaml;version="[${project.version},2)",org.yaml.snakeyaml.composer;version="[${project.version},2)",org.yaml.snakeyaml.constructor;version="[${project.version},2)",org.yaml.snakeyaml.emitter;version="[${project.version},2)",org.yaml.snakeyaml.error;version="[${project.version},2)",org.yaml.snakeyaml.events;version="[${project.version},2)",org.yaml.snakeyaml.introspector;version="[${project.version},2)",org.yaml.snakeyaml.nodes;version="[${project.version},2)",org.yaml.snakeyaml.parser;version="[${project.version},2)",org.yaml.snakeyaml.reader;version="[${project.version},2)",org.yaml.snakeyaml.representer;version="[${project.version},2)",org.yaml.snakeyaml.resolver;version="[${project.version},2)",org.yaml.snakeyaml.scanner;version="[${project.version},2)",org.yaml.snakeyaml.serializer;version="[${project.version},2)",org.yaml.snakeyaml.tokens;version="[${project.version},2)",org.yaml.snakeyaml.util;version="[${project.version},2)""/>
|
<attribute name="Import-Package" value="org.apache.commons.codec.net,org.yaml.snakeyaml.comments,org.yaml.snakeyaml.composer,org.yaml.snakeyaml.constructor,org.yaml.snakeyaml.emitter,org.yaml.snakeyaml.error,org.yaml.snakeyaml.events,org.yaml.snakeyaml.inspector,org.yaml.snakeyaml.internal,org.yaml.snakeyaml.introspector,org.yaml.snakeyaml.nodes,org.yaml.snakeyaml.parser,org.yaml.snakeyaml.reader,org.yaml.snakeyaml.representer,org.yaml.snakeyaml.resolver,org.yaml.snakeyaml.scanner,org.yaml.snakeyaml.serializer,org.yaml.snakeyaml.tokens,org.yaml.snakeyaml.util,org.yaml.snakeyaml"/>
|
||||||
<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
|
|
||||||
<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
|
<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
|
||||||
<attribute name="JavaPackages-Version" value="${project.version}"/>
|
<attribute name="JavaPackages-Version" value="${project.version}"/>
|
||||||
|
<attribute name="Multi-Release" value="true"/>
|
||||||
<attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/>
|
<attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/>
|
||||||
</manifest>
|
</manifest>
|
||||||
</jar>
|
</jar>
|
||||||
|
|||||||
@ -1,3 +1,62 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu May 2 13:24:11 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Modified patch:
|
||||||
|
* 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
|
||||||
|
+ remove unused List variable that was originally used for
|
||||||
|
debugging purposes
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 29 11:44:13 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- The binaries are compatible with java 1.8
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Apr 16 13:55:05 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Upgrade to upstrem version 2.2
|
||||||
|
* Changes of 2.2
|
||||||
|
+ Define default scalar style as PLAIN (for polyglot Maven)
|
||||||
|
+ Add missing 'exports org.yaml.snakeyaml.inspector' to
|
||||||
|
module-info.java
|
||||||
|
* Changes of 2.1
|
||||||
|
+ Heavy Allocation in Emitter.analyzeScalar(String) due to Regex
|
||||||
|
Overhead. Fixes 1075.
|
||||||
|
+ Use identity in toString() for sequences to avoid
|
||||||
|
OutOfMemoryError. Fixes 1064.
|
||||||
|
+ NumberFormatException from SnakeYAML due to int overflow for
|
||||||
|
corrupt YAML version. Fixes 1061.
|
||||||
|
+ Document size limit should be applied to single document not
|
||||||
|
the whole input stream. Fixes 1065.
|
||||||
|
+ Detect invalid Unicode code point (thanks to Tatu Saloranta).
|
||||||
|
Fixes 576.
|
||||||
|
+ Remove Trusted*Inspector classes from main sources tree
|
||||||
|
* Changes of 2.0
|
||||||
|
+ Rollback to Java 7 target. Fixes 570.
|
||||||
|
+ Add module-info.java. Fixes 495.
|
||||||
|
+ Migrate to Java 8
|
||||||
|
+ Remove many deprecated constructors
|
||||||
|
+ Remove long deprecated methods in FlowStyle
|
||||||
|
+ Do not allow global tags by default. Fixes 565.
|
||||||
|
+ Yaml.LoadAs() signature to support Class<? super T> type
|
||||||
|
instead of Class<T>. Fixes 556.
|
||||||
|
+ CustomClassLoaderConstructor takes LoaderOptions
|
||||||
|
+ Check input parameters for non-null values
|
||||||
|
- Removed patch:
|
||||||
|
* 0003-Fix-ReaderBomTest.patch
|
||||||
|
+ not needed
|
||||||
|
- Modified patches:
|
||||||
|
* 0001-replace-bundled-base64coder-with-java.util.Base64.patch ->
|
||||||
|
0001-Remove-external-Base64Coder-and-use-provided-Base64.patch
|
||||||
|
+ use the patch integrated for inclusion in 2.3
|
||||||
|
* 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
|
||||||
|
+ regenerate and fix tests
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Feb 21 17:28:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Use %patch -P N instead of deprecated %patchN.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Oct 18 07:17:01 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Tue Oct 18 07:17:01 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
|||||||
108
snakeyaml.spec
108
snakeyaml.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package snakeyaml
|
# spec file for package snakeyaml
|
||||||
#
|
#
|
||||||
# Copyright (c) 2022 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,10 +16,13 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%global vertag 7f5106920d77
|
%global vertag a34989252e6f
|
||||||
|
# The automatic requires would be java-headless >= 9, but the
|
||||||
|
# binaries are java 8 compatible
|
||||||
|
%define __requires_exclude java-headless
|
||||||
%bcond_with tests
|
%bcond_with tests
|
||||||
Name: snakeyaml
|
Name: snakeyaml
|
||||||
Version: 1.33
|
Version: 2.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: YAML parser and emitter for the Java programming language
|
Summary: YAML parser and emitter for the Java programming language
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
@ -27,37 +30,17 @@ Group: Development/Libraries/Java
|
|||||||
URL: https://bitbucket.org/%{name}/%{name}
|
URL: https://bitbucket.org/%{name}/%{name}
|
||||||
Source0: https://bitbucket.org/%{name}/%{name}/get/%{name}-%{version}.tar.bz2
|
Source0: https://bitbucket.org/%{name}/%{name}/get/%{name}-%{version}.tar.bz2
|
||||||
Source1: %{name}-build.xml
|
Source1: %{name}-build.xml
|
||||||
# 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
|
|
||||||
#
|
|
||||||
# Replace use of bundled Base64 implementation with java.util.Base64
|
# Replace use of bundled Base64 implementation with java.util.Base64
|
||||||
Patch0: 0001-replace-bundled-base64coder-with-java.util.Base64.patch
|
Patch0: 0001-Remove-external-Base64Coder-and-use-provided-Base64.patch
|
||||||
# We don't have gdata-java, use commons-codec instead
|
# We don't have gdata-java, use commons-codec instead
|
||||||
Patch1: 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
|
Patch1: 0002-Replace-bundled-gdata-java-client-classes-with-commo.patch
|
||||||
Patch2: 0003-Fix-ReaderBomTest.patch
|
|
||||||
BuildRequires: ant
|
BuildRequires: ant
|
||||||
BuildRequires: apache-commons-codec
|
BuildRequires: apache-commons-codec
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: java-devel >= 1.8
|
BuildRequires: java-devel >= 9
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local >= 6
|
||||||
Requires: mvn(commons-codec:commons-codec)
|
Requires: java-headless >= 1.8
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
%if %{with tests}
|
|
||||||
BuildRequires: ant-junit
|
|
||||||
BuildRequires: apache-commons-collections
|
|
||||||
BuildRequires: apache-commons-lang
|
|
||||||
BuildRequires: hamcrest-core
|
|
||||||
BuildRequires: joda-time
|
|
||||||
BuildRequires: junit
|
|
||||||
BuildRequires: oro
|
|
||||||
BuildRequires: velocity
|
|
||||||
# Differently sorted collections make fail some tests that rely on a particular order
|
|
||||||
BuildConflicts: java >= 9
|
|
||||||
BuildConflicts: java-devel >= 9
|
|
||||||
BuildConflicts: java-headless >= 9
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
SnakeYAML features:
|
SnakeYAML features:
|
||||||
@ -79,77 +62,18 @@ This package contains %{summary}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{name}-%{vertag}
|
%setup -q -n %{name}-%{name}-%{vertag}
|
||||||
cp %{SOURCE1} build.xml
|
cp %{SOURCE1} build.xml
|
||||||
%patch0 -p1
|
%patch -P 0 -p1
|
||||||
%patch1 -p1
|
%patch -P 1 -p1
|
||||||
%patch2 -p1
|
|
||||||
|
|
||||||
%pom_remove_plugin :cobertura-maven-plugin
|
|
||||||
%pom_remove_plugin :maven-changes-plugin
|
|
||||||
%pom_remove_plugin :maven-license-plugin
|
|
||||||
%pom_remove_plugin :maven-javadoc-plugin
|
|
||||||
%pom_remove_plugin :maven-site-plugin
|
|
||||||
|
|
||||||
sed -i "/<artifactId>spring</s/spring/&-core/" pom.xml
|
|
||||||
rm -f src/test/java/examples/SpringTest.java
|
|
||||||
|
|
||||||
# Replacement for bundled gdata-java-client
|
|
||||||
%pom_add_dep commons-codec:commons-codec
|
|
||||||
|
|
||||||
# Unnecessary test-time only dependency
|
# Unnecessary test-time only dependency
|
||||||
%pom_remove_dep joda-time:joda-time
|
%pom_change_dep joda-time:joda-time :::test
|
||||||
rm -rf src/test/java/examples/jodatime
|
%pom_change_dep org.projectlombok:lombok :::test
|
||||||
%pom_remove_dep org.projectlombok:lombok
|
%pom_change_dep org.apache.velocity:velocity-engine-core :::test
|
||||||
%pom_remove_dep org.apache.velocity:velocity-engine-core
|
|
||||||
|
|
||||||
# fails in rpmbuild only due to different locale
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue67/NonAsciiCharsInClassNameTest.java
|
|
||||||
# fails after unbundling
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue318/ContextClassLoaderTest.java
|
|
||||||
|
|
||||||
# Tests using dependencies we don't have/have removed
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/emitter/template/VelocityTest.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue387/YamlExecuteProcessContextTest.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/env/ApplicationProperties.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/env/EnvLombokTest.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue527/Fuzzy47047Test.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue530/Fuzzy47039Test.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue543/Fuzzer50355Test.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue525/FuzzyStackOverflowTest.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue529/Fuzzy47028Test.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue531/Fuzzy47081Test.java
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue526/Fuzzy47027Test.java
|
|
||||||
|
|
||||||
# Problematic test resources for maven-resources-plugin 3.2
|
|
||||||
rm src/test/resources/issues/issue99.jpeg
|
|
||||||
rm src/test/resources/reader/unicode-16be.txt
|
|
||||||
rm src/test/resources/reader/unicode-16le.txt
|
|
||||||
rm src/test/resources/pyyaml/spec-05-01-utf16be.data
|
|
||||||
rm src/test/resources/pyyaml/spec-05-01-utf16le.data
|
|
||||||
rm src/test/resources/pyyaml/spec-05-02-utf16le.data
|
|
||||||
rm src/test/resources/pyyaml/odd-utf16.stream-error
|
|
||||||
rm src/test/resources/pyyaml/invalid-character.loader-error
|
|
||||||
rm src/test/resources/pyyaml/invalid-character.stream-error
|
|
||||||
rm src/test/resources/pyyaml/invalid-utf8-byte.loader-error
|
|
||||||
rm src/test/resources/pyyaml/invalid-utf8-byte.stream-error
|
|
||||||
rm src/test/resources/pyyaml/empty-document-bug.data
|
|
||||||
rm src/test/resources/pyyaml/spec-05-02-utf16be.data
|
|
||||||
rm -rf src/test/resources/fuzzer/
|
|
||||||
# Test using the jpeg data removed above
|
|
||||||
rm src/test/java/org/yaml/snakeyaml/issues/issue99/YamlBase64Test.java
|
|
||||||
|
|
||||||
# convert CR+LF to LF
|
|
||||||
sed -i 's/\r//g' LICENSE.txt
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p lib
|
mkdir -p lib
|
||||||
build-jar-repository -s lib commons-codec
|
build-jar-repository -s lib commons-codec
|
||||||
%if %{with tests}
|
|
||||||
build-jar-repository -s lib junit hamcrest/core velocity commons-collections commons-lang oro joda-time
|
|
||||||
%endif
|
|
||||||
%{ant} \
|
%{ant} \
|
||||||
%if %{without tests}
|
|
||||||
-Dtest.skip=true \
|
|
||||||
%endif
|
|
||||||
clean package javadoc
|
clean package javadoc
|
||||||
|
|
||||||
%install
|
%install
|
||||||
@ -158,7 +82,7 @@ install -dm 0755 %{buildroot}%{_javadir}
|
|||||||
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
|
||||||
# pom
|
# pom
|
||||||
install -dm 0755 %{buildroot}%{_mavenpomdir}
|
install -dm 0755 %{buildroot}%{_mavenpomdir}
|
||||||
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
|
||||||
%add_maven_depmap JPP-%{name}.pom %{name}.jar
|
%add_maven_depmap JPP-%{name}.pom %{name}.jar
|
||||||
# javadoc
|
# javadoc
|
||||||
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
|
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user