Browse Source

Polish 'Migrate from soon to be deprecate SnakeYAML constructor'

See gh-33663
pull/33918/head
Phillip Webb 3 years ago
parent
commit
2faede6245
  1. 12
      spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/LayersIndex.java

12
spring-boot-system-tests/spring-boot-image-tests/src/systemTest/java/org/springframework/boot/image/paketo/LayersIndex.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2023 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -46,13 +46,17 @@ class LayersIndex extends ArrayList<Map<String, List<String>>> {
String indexPath = (archiveFile.getName().endsWith(".war") ? "WEB-INF/layers.idx" : "BOOT-INF/layers.idx"); String indexPath = (archiveFile.getName().endsWith(".war") ? "WEB-INF/layers.idx" : "BOOT-INF/layers.idx");
try (JarFile jarFile = new JarFile(archiveFile)) { try (JarFile jarFile = new JarFile(archiveFile)) {
ZipEntry indexEntry = jarFile.getEntry(indexPath); ZipEntry indexEntry = jarFile.getEntry(indexPath);
Yaml yaml = new Yaml(new Constructor(LayersIndex.class, getLoaderOptions()));
return yaml.load(jarFile.getInputStream(indexEntry));
}
}
private static LoaderOptions getLoaderOptions() {
LoaderOptions loaderOptions = new LoaderOptions(); LoaderOptions loaderOptions = new LoaderOptions();
loaderOptions.setAllowDuplicateKeys(false); loaderOptions.setAllowDuplicateKeys(false);
loaderOptions.setMaxAliasesForCollections(Integer.MAX_VALUE); loaderOptions.setMaxAliasesForCollections(Integer.MAX_VALUE);
loaderOptions.setAllowRecursiveKeys(true); loaderOptions.setAllowRecursiveKeys(true);
Yaml yaml = new Yaml(new Constructor(LayersIndex.class, loaderOptions)); return loaderOptions;
return yaml.load(jarFile.getInputStream(indexEntry));
}
} }
} }

Loading…
Cancel
Save