Skip to content
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

Jump to bottom

Make ClassLoaderResourceAccessor implement Closable #2308

Merged
merged 4 commits into from Jan 26, 2022
Merged

Make ClassLoaderResourceAccessor implement Closable #2308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6a8d514
Update ClassLoaderResourceAccessor.java
Delir4um Dec 31, 2021
228c509
Merge branch 'patch-1' of https://github.com/Delir4um/liquibase into …
nvoxland Jan 5, 2022
99ea4b5
Log when there are issues closing a ResourceAccessor
nvoxland Jan 5, 2022
92c2d83
Added test for ClassLoaderResourceAccessor.close()
nvoxland Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 15 additions & 2 deletions liquibase-core/src/main/java/liquibase/resource/ClassLoaderResourceAccessor.java
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@
*
* @see OSGiResourceAccessor for OSGi-based classloaders
*/
public class ClassLoaderResourceAccessor extends AbstractResourceAccessor {
public class ClassLoaderResourceAccessor extends AbstractResourceAccessor implements AutoCloseable {

private ClassLoader classLoader;
protected List<FileSystem> rootPaths;
Expand Down Expand Up @@ -270,7 +270,7 @@ protected SortedSet<String> listFromClassLoader(String path, boolean recursive,
try (JarFile jar = new JarFile(URLDecoder.decode(jarPath, StandardCharsets.UTF_8.name()))) {
String comparePath = path;
if (comparePath.startsWith("/")) {
comparePath = "/"+comparePath;
comparePath = "/" + comparePath;
}
Enumeration<JarEntry> entries = jar.entries();
while (entries.hasMoreElements()) {
Expand Down Expand Up @@ -355,4 +355,17 @@ public SortedSet<String> describeLocations() {

return description;
}

@Override
public void close() throws Exception {
if (rootPaths != null) {
for (final FileSystem rootPath : rootPaths) {
try {
rootPath.close();
} catch (final Exception e) {
Scope.getCurrentScope().getLog(getClass()).fine("Cannot close path " + e.getMessage(), e);
}
}
}
}
}
21 changes: 21 additions & 0 deletions liquibase-core/src/test/groovy/liquibase/resource/ClassLoaderResourceAccessorTest.groovy
View file
Open in desktop
Expand Up @@ -5,6 +5,8 @@ import liquibase.util.StreamUtil
import spock.lang.Specification
import spock.lang.Unroll

import java.nio.file.FileSystem

class ClassLoaderResourceAccessorTest extends Specification {

def testResourceAccessor = new ClassLoaderResourceAccessor(new URLClassLoader(
Expand Down Expand Up @@ -153,4 +155,23 @@ class ClassLoaderResourceAccessorTest extends Specification {
],
]
}

def close() {
setup:
FileSystem path1 = Mock()
FileSystem path2 = Mock()

when:
def testAccessor = new ClassLoaderResourceAccessor(this.getClass().getClassLoader())

testAccessor.rootPaths = null;
testAccessor.close() //no errors thrown from close() when rootPaths is null

testAccessor.rootPaths = [path1, path2]
testAccessor.close()

then:
2 * path1.close()
1 * path2.close()
}
}