Skip to content

jar: Replace incorrect use of computeIfAbsent in putResource #3904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjhargrave merged 2 commits into from
Apr 10, 2020
Merged

jar: Replace incorrect use of computeIfAbsent in putResource #3904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5092a4
jar: Fix getPackages to handle non-null empty directory
bjhargrave Apr 10, 2020
97eb299
jar: Replace incorrect use of computeIfAbsent in putResource
bjhargrave Apr 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 62 additions & 15 deletions biz.aQute.bndlib.tests/test/test/JarTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,51 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
import static org.assertj.core.data.Offset.strictOffset;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.lang.reflect.Method;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
import java.util.zip.ZipEntry;
import java.util.zip.ZipException;
import java.util.zip.ZipInputStream;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;

import aQute.bnd.osgi.Builder;
import aQute.bnd.osgi.Constants;
import aQute.bnd.osgi.EmbeddedResource;
import aQute.bnd.osgi.FileResource;
import aQute.bnd.osgi.Jar;
import aQute.bnd.osgi.Resource;
import aQute.lib.io.IO;
import junit.framework.TestCase;

@SuppressWarnings("resource")

public class JarTest extends TestCase {
public class JarTest {

File tmp;

private String getTestName() {
return getClass().getName() + "/" + getName();
}

@Override
protected void setUp() throws Exception {
tmp = IO.getFile("generated/tmp/test/" + getTestName());
@BeforeEach
public void setUp(TestInfo info) throws Exception {
Method testMethod = info.getTestMethod()
.get();
tmp = new File("generated/tmp/test/" + getClass().getName() + "/" + testMethod.getName()).getAbsoluteFile();
IO.delete(tmp);
IO.mkdirs(tmp);
}

@Test
public void testDeletePrefix() {
Resource r = new EmbeddedResource(new byte[1], 0L);

Expand Down Expand Up @@ -68,6 +75,7 @@ public void testDeletePrefix() {
}
}

@Test
public void testDeleteSubDirs() {
Resource r = new EmbeddedResource(new byte[1], 0L);

Expand Down Expand Up @@ -97,6 +105,7 @@ public void testDeleteSubDirs() {
}
}

@Test
public void testDeleteSubDirs2() {
Resource r = new EmbeddedResource(new byte[1], 0L);

Expand Down Expand Up @@ -124,6 +133,36 @@ public void testDeleteSubDirs2() {
}
}

@Test
public void testPackages() {
Resource r = new EmbeddedResource(new byte[1], 0L);

try (Jar jar = new Jar("test")) {
jar.putResource("com/example/foo/bar/x.class", r);
jar.putResource("com/example/foo/bar/package-info.class", r);

assertThat(jar.getDirectories()).containsKeys("com/example/foo/bar", "com/example/foo", "com/example",
"com");

assertThat(jar.getPackages()).contains("com.example.foo.bar")
.doesNotContain("com.example.foo", "com.example", "com");

jar.remove("com/example/foo/bar/x.class");
assertThat(jar.getDirectories()).containsKeys("com/example/foo/bar", "com/example/foo", "com/example",
"com");
assertThat(jar.getPackages()).contains("com.example.foo.bar")
.doesNotContain("com.example.foo", "com.example", "com");

jar.remove("com/example/foo/bar/package-info.class");
assertThat(jar.getDirectories()).containsKeys("com/example/foo/bar", "com/example/foo", "com/example",
"com");
assertThat(jar.getPackages()).doesNotContain("com.example.foo.bar", "com.example.foo", "com.example",
"com");

}
}

@Test
public void testWriteFolder() throws Exception {
try (Builder b = new Builder()) {
b.setIncludeResource("/a/b.txt;literal='ab', /a/c.txt;literal='ac', /a/c/d/e.txt;literal='acde'");
Expand All @@ -140,6 +179,7 @@ public void testWriteFolder() throws Exception {
}
}

@Test
public void testNoManifest() throws Exception {
try (Jar jar = new Jar("dot")) {
jar.setManifest(new Manifest());
Expand All @@ -149,14 +189,16 @@ public void testNoManifest() throws Exception {
ByteArrayOutputStream bout = new ByteArrayOutputStream();
jar.write(bout);

Jar jin = new Jar("dotin", new ByteArrayInputStream(bout.toByteArray()));
Resource m = jin.getResource("META-INF/MANIFEST.MF");
assertNull(m);
Resource r = jin.getResource("a/b");
assertNotNull(r);
try (Jar jin = new Jar("dotin", new ByteArrayInputStream(bout.toByteArray()))) {
Resource m = jin.getResource("META-INF/MANIFEST.MF");
assertNull(m);
Resource r = jin.getResource("a/b");
assertNotNull(r);
}
}
}

@Test
public void testManualManifest() throws Exception {
try (Jar jar = new Jar("dot")) {
jar.setManifest(new Manifest());
Expand All @@ -176,6 +218,7 @@ public void testManualManifest() throws Exception {
}
}

@Test
public void testRenameManifest() throws Exception {
try (Jar jar = new Jar("dot")) {
Manifest manifest = new Manifest();
Expand All @@ -202,6 +245,7 @@ public void testRenameManifest() throws Exception {
}
}

@Test
public void testSimple() throws ZipException, IOException {
File file = IO.getFile("jar/asm.jar");
try (Jar jar = new Jar("asm.jar", file)) {
Expand Down Expand Up @@ -232,6 +276,7 @@ public void testSimple() throws ZipException, IOException {
}
}

@Test
public void testNewLine() throws Exception {
try (Jar jar = new Jar("dot")) {
Manifest manifest = new Manifest();
Expand All @@ -257,6 +302,7 @@ public void testNewLine() throws Exception {
}
}

@Test
public void testZipSlip() throws Exception {
assertThat(catchThrowable(() -> {
try (Jar jar = new Jar(new File("jar/zip-slip.zip"))) {
Expand All @@ -266,6 +312,7 @@ public void testZipSlip() throws Exception {
.isInstanceOfAny(IOException.class, UncheckedIOException.class);
}

@Test
public void testCreateZipSlip() throws Exception {
try (Jar jar = new Jar("zipzlip")) {
assertThat(catchThrowable(() -> {
Expand Down
12 changes: 8 additions & 4 deletions biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,16 +326,19 @@ public boolean putResource(String path, Resource resource, boolean overwrite) {
} else if (path.equals(Constants.MODULE_INFO_CLASS)) {
moduleAttribute = null;
}
Map<String, Resource> s = directories.computeIfAbsent(getParent(path), dir -> {
String dir = getParent(path);
Map<String, Resource> s = directories.get(dir);
if (s == null) {
s = new TreeMap<>();
directories.put(dir, s);
// make ancestor directories
for (int n; (n = dir.lastIndexOf('/')) > 0;) {
dir = dir.substring(0, n);
if (directories.containsKey(dir))
break;
directories.put(dir, null);
}
return new TreeMap<>();
});
}
boolean duplicate = s.containsKey(path);
if (!duplicate || overwrite) {
resources.put(path, resource);
Expand Down Expand Up @@ -987,7 +990,8 @@ public boolean hasDirectory(String path) {
public List<String> getPackages() {
check();
return MapStream.of(directories)
.filterValue(Objects::nonNull)
.filterValue(mdir -> Objects.nonNull(mdir) && !mdir
.isEmpty())
.keys()
.map(k -> k.replace('/', '.'))
.collect(toList());
Expand Down