Skip to content

Commit 636b1a1

Browse files
authored
Deprecated SnakeYAML methods (#3079)
I replaced the deprecated methods in SnakeYAML 1.33 with the respective non-deprecated constructor calls. These are equivalent: The deprecated non-arg constructor of Constructor https://bitbucket.org/snakeyaml/snakeyaml/src/snakeyaml-1.33/src/main/java/org/yaml/snakeyaml/constructor/Constructor.java calls https://bitbucket.org/snakeyaml/snakeyaml/src/7f5106920d7754ecab734725ba577083e55c7204/src/main/java/org/yaml/snakeyaml/constructor/SafeConstructor.java#lines-52, which uses a new empty LoaderOptions() Similarly, SafeRepresenter https://bitbucket.org/snakeyaml/snakeyaml/src/7f5106920d7754ecab734725ba577083e55c7204/src/main/java/org/yaml/snakeyaml/representer/SafeRepresenter.java#lines-54 uses a new empty DumperOptions.
1 parent e53869c commit 636b1a1

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/ClassSafeConstructor.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.yaml.snakeyaml.constructor.AbstractConstruct;
2020
import org.yaml.snakeyaml.constructor.Constructor;
2121
import org.yaml.snakeyaml.error.YAMLException;
22+
import org.yaml.snakeyaml.LoaderOptions;
2223
import org.yaml.snakeyaml.nodes.Node;
2324
import org.yaml.snakeyaml.nodes.ScalarNode;
2425
import org.yaml.snakeyaml.nodes.Tag;
@@ -29,6 +30,7 @@ public class ClassSafeConstructor extends Constructor {
2930
protected final List<Class<?>> allowableClasses = new ArrayList<>();
3031

3132
public ClassSafeConstructor() {
33+
super(new LoaderOptions());
3234
this.yamlConstructors.put(Tag.STR, new ConstructStringEx());
3335

3436
this.allowableClasses.add(MetaInfo.class);

brut.apktool/apktool-lib/src/main/java/brut/androlib/meta/EscapedStringRepresenter.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
*/
1717
package brut.androlib.meta;
1818

19+
import org.yaml.snakeyaml.DumperOptions;
1920
import org.yaml.snakeyaml.nodes.Node;
2021
import org.yaml.snakeyaml.representer.Representer;
2122

2223
public class EscapedStringRepresenter extends Representer {
2324
public EscapedStringRepresenter() {
25+
super(new DumperOptions());
2426
RepresentStringEx representStringEx = new RepresentStringEx();
2527
multiRepresenters.put(String.class, representStringEx);
2628
representers.put(String.class, representStringEx);

0 commit comments

Comments
 (0)