root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.3.x'

This commit is contained in:
Phillip Webb 2020-08-18 15:39:08 -07:00
parent 341615d7d0 60b5de192c
commit aa2580bb51
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/web/documentation/HealthEndpointDocumentationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.

8
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/AbstractJarFile.java
View File

@ -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}.

6
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java
View File

@ -178,7 +178,7 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
} }
@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);
} }
@ -248,7 +248,7 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
} }
@Override @Override
protected InputStream getInputStream() throws IOException { InputStream getInputStream() throws IOException {
return this.data.getInputStream(); return this.data.getInputStream();
} }
@ -421,7 +421,7 @@ public class JarFile extends AbstractJarFile implements Iterable<java.util.jar.J
} }
@Override @Override
protected JarFileType getType() { JarFileType getType() {
return this.type; return this.type;
} }

8
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFileWrapper.java
View File

@ -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();
} }

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/main/java/smoketest/actuator/SampleLegacyEndpointWithHyphen.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.

2
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/SampleActuatorApplicationTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 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.