Browse Source

Fix formatting

pull/47784/head
Stéphane Nicoll 2 months ago
parent
commit
728cb95a17
  1. 3
      core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java
  2. 6
      core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java
  3. 3
      core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java
  4. 3
      loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java
  5. 4
      module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java
  6. 6
      module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java

3
core/spring-boot/src/main/java/org/springframework/boot/bootstrap/BootstrapRegistry.java

@ -105,8 +105,7 @@ public interface BootstrapRegistry { @@ -105,8 +105,7 @@ public interface BootstrapRegistry {
* bootstrap instances.
* @return the instance or {@code null}
*/
@Nullable
T get(BootstrapContext context);
@Nullable T get(BootstrapContext context);
/**
* Return the scope of the supplied instance.

6
core/spring-boot/src/main/java/org/springframework/boot/context/properties/PropertyMapper.java

@ -383,8 +383,7 @@ public final class PropertyMapper { @@ -383,8 +383,7 @@ public final class PropertyMapper {
* @param value the value to adapt
* @return an adapted value or {@code null}
*/
@Nullable
R adapt(T value);
@Nullable R adapt(T value);
}
@ -512,8 +511,7 @@ public final class PropertyMapper { @@ -512,8 +511,7 @@ public final class PropertyMapper {
* @param value the value to adapt
* @return an adapted value or {@code null}
*/
@Nullable
R adapt(@Nullable T value);
@Nullable R adapt(@Nullable T value);
}

3
core/spring-boot/src/main/java/org/springframework/boot/web/servlet/support/ErrorPageFilter.java

@ -355,8 +355,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry, Ordered { @@ -355,8 +355,7 @@ public class ErrorPageFilter implements Filter, ErrorPageRegistry, Ordered {
}
}
@Nullable
String getMessage() {
@Nullable String getMessage() {
return this.message;
}

3
loader/spring-boot-loader-tools/src/main/java/org/springframework/boot/loader/tools/AbstractJarWriter.java

@ -362,8 +362,7 @@ public abstract class AbstractJarWriter implements LoaderClassesWriter { @@ -362,8 +362,7 @@ public abstract class AbstractJarWriter implements LoaderClassesWriter {
*/
EntryTransformer NONE = (jarEntry) -> jarEntry;
@Nullable
JarArchiveEntry transform(JarArchiveEntry jarEntry);
@Nullable JarArchiveEntry transform(JarArchiveEntry jarEntry);
}

4
module/spring-boot-jpa/src/main/java/org/springframework/boot/jpa/EntityManagerFactoryBuilder.java

@ -169,7 +169,7 @@ public class EntityManagerFactoryBuilder { @@ -169,7 +169,7 @@ public class EntityManagerFactoryBuilder {
* @return the builder for fluent usage
* @see #managedTypes(PersistenceManagedTypes)
*/
public Builder packages(String @Nullable... packagesToScan) {
public Builder packages(String @Nullable ... packagesToScan) {
this.packagesToScan = packagesToScan;
return this;
}
@ -222,7 +222,7 @@ public class EntityManagerFactoryBuilder { @@ -222,7 +222,7 @@ public class EntityManagerFactoryBuilder {
* @param mappingResources the mapping resources to use
* @return the builder for fluent usage
*/
public Builder mappingResources(String @Nullable... mappingResources) {
public Builder mappingResources(String @Nullable ... mappingResources) {
this.mappingResources = mappingResources;
return this;
}

6
module/spring-boot-web-server/src/main/java/org/springframework/boot/web/server/context/WebServerApplicationContext.java

@ -50,8 +50,7 @@ public interface WebServerApplicationContext extends ApplicationContext { @@ -50,8 +50,7 @@ public interface WebServerApplicationContext extends ApplicationContext {
* the server has not yet been created.
* @return the web server
*/
@Nullable
WebServer getWebServer();
@Nullable WebServer getWebServer();
/**
* Returns the namespace of the web server application context or {@code null} if no
@ -60,8 +59,7 @@ public interface WebServerApplicationContext extends ApplicationContext { @@ -60,8 +59,7 @@ public interface WebServerApplicationContext extends ApplicationContext {
* different port).
* @return the server namespace
*/
@Nullable
String getServerNamespace();
@Nullable String getServerNamespace();
/**
* Returns {@code true} if the specified context is a

Loading…
Cancel
Save