Refine AbstractJarFile method visibility

Refine method visibility in an attempt to fix test issues on Java 11+.

See gh-22991
pull/23104/head
Phillip Webb 4 years ago
parent aac367e9c5
commit 5997cbd21f

@ -45,26 +45,26 @@ abstract class AbstractJarFile extends java.util.jar.JarFile {
* @return the URL * @return the URL
* @throws MalformedURLException if the URL is malformed * @throws MalformedURLException if the URL is malformed
*/ */
protected abstract URL getUrl() throws MalformedURLException; abstract URL getUrl() throws MalformedURLException;
/** /**
* Return the {@link JarFileType} of this instance. * Return the {@link JarFileType} of this instance.
* @return the jar file type * @return the jar file type
*/ */
protected abstract JarFileType getType(); abstract JarFileType getType();
/** /**
* Return the security permission for this JAR. * Return the security permission for this JAR.
* @return the security permission. * @return the security permission.
*/ */
protected abstract Permission getPermission(); abstract Permission getPermission();
/** /**
* Return an {@link InputStream} for the entire jar contents. * Return an {@link InputStream} for the entire jar contents.
* @return the contents input stream * @return the contents input stream
* @throws IOException on IO error * @throws IOException on IO error
*/ */
protected abstract InputStream getInputStream() throws IOException; abstract InputStream getInputStream() throws IOException;
/** /**
* The type of a {@link JarFile}. * The type of a {@link JarFile}.

@ -174,7 +174,7 @@ public class JarFile extends AbstractJarFile {
} }
@Override @Override
protected Permission getPermission() { Permission getPermission() {
return new FilePermission(this.rootFile.getFile().getPath(), READ_ACTION); return new FilePermission(this.rootFile.getFile().getPath(), READ_ACTION);
} }
@ -225,7 +225,7 @@ public class JarFile extends AbstractJarFile {
} }
@Override @Override
protected InputStream getInputStream() throws IOException { InputStream getInputStream() throws IOException {
return this.data.getInputStream(); return this.data.getInputStream();
} }
@ -389,7 +389,7 @@ public class JarFile extends AbstractJarFile {
} }
@Override @Override
protected JarFileType getType() { JarFileType getType() {
return this.type; return this.type;
} }

@ -43,17 +43,17 @@ class JarFileWrapper extends AbstractJarFile {
} }
@Override @Override
protected URL getUrl() throws MalformedURLException { URL getUrl() throws MalformedURLException {
return this.parent.getUrl(); return this.parent.getUrl();
} }
@Override @Override
protected JarFileType getType() { JarFileType getType() {
return this.parent.getType(); return this.parent.getType();
} }
@Override @Override
protected Permission getPermission() { Permission getPermission() {
return this.parent.getPermission(); return this.parent.getPermission();
} }
@ -78,7 +78,7 @@ class JarFileWrapper extends AbstractJarFile {
} }
@Override @Override
protected InputStream getInputStream() throws IOException { InputStream getInputStream() throws IOException {
return this.parent.getInputStream(); return this.parent.getInputStream();
} }

Loading…
Cancel
Save