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

Relocate AotProcessingHook 

Relocate `AotProcessingHook` to be an static class of `AotProcessor`.
This commit is contained in:
Phillip Webb 2022-05-31 15:51:12 -07:00
parent 6e9ea85835
commit 6d80723598
2 changed files with 41 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/AotProcessingHook.java
View File

@ -1,59 +0,0 @@
/*
* Copyright 2012-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot;
import org.springframework.boot.SpringApplicationHooks.Hook;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.util.Assert;
/**
* A {@link Hook} used to prevent standard refresh of the application's context, ready for
* subsequent {@link GenericApplicationContext#refreshForAotProcessing() AOT processing}.
*
* @author Andy Wilkinson
*/
class AotProcessingHook implements Hook {
private GenericApplicationContext context;
@Override
public boolean preRefresh(SpringApplication application, ConfigurableApplicationContext context) {
Assert.isInstanceOf(GenericApplicationContext.class, context,
() -> "AOT processing requires a GenericApplicationContext but got a " + context.getClass().getName());
this.context = (GenericApplicationContext) context;
return false;
}
@Override
public void postRun(SpringApplication application, ConfigurableApplicationContext context) {
throw new MainMethodSilentExitException();
}
GenericApplicationContext getApplicationContext() {
return this.context;
}
/**
* Internal exception used to prevent main method to continue once
* {@code SpringApplication#run} completes.
*/
static class MainMethodSilentExitException extends RuntimeException {
}
}

44
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/AotProcessor.java
View File

@ -36,7 +36,9 @@ import org.springframework.aot.hint.ReflectionHints;
import org.springframework.aot.hint.RuntimeHints;
import org.springframework.aot.hint.TypeReference;
import org.springframework.aot.nativex.FileNativeConfigurationWriter;
import org.springframework.boot.AotProcessingHook.MainMethodSilentExitException;
import org.springframework.boot.SpringApplicationHooks.Hook;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.context.aot.ApplicationContextAotGenerator;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.javapoet.ClassName;
@ -100,7 +102,7 @@ public class AotProcessor {
*/
public void process() {
deleteExistingOutput();
AotProcessingHook hook = new AotProcessingHook();
AotProcessorHook hook = new AotProcessorHook();
SpringApplicationHooks.withHook(hook, this::callApplicationMainMethod);
GenericApplicationContext applicationContext = hook.getApplicationContext();
Assert.notNull(applicationContext, "No application context available after calling main method of '"
@ -129,7 +131,7 @@ public class AotProcessor {
}
catch (InvocationTargetException ex) {
Throwable targetException = ex.getTargetException();
if (!(targetException instanceof MainMethodSilentExitException)) {
if (!(targetException instanceof SilentExitException)) {
throw (targetException instanceof RuntimeException runtimeEx) ? runtimeEx
: new RuntimeException(targetException);
}
@ -225,4 +227,40 @@ public class AotProcessor {
aotProcess.process();
}
/**
* Hook used to capture the {@link ApplicationContext} and trigger early exit of main
* method.
*/
private static class AotProcessorHook implements Hook {
private GenericApplicationContext context;
@Override
public boolean preRefresh(SpringApplication application, ConfigurableApplicationContext context) {
Assert.isInstanceOf(GenericApplicationContext.class, context,
() -> "AOT processing requires a GenericApplicationContext but got a "
+ context.getClass().getName());
this.context = (GenericApplicationContext) context;
return false;
}
@Override
public void postRun(SpringApplication application, ConfigurableApplicationContext context) {
throw new SilentExitException();
}
GenericApplicationContext getApplicationContext() {
return this.context;
}
}
/**
* Internal exception used to prevent main method to continue once
* {@code SpringApplication#run} completes.
*/
private static class SilentExitException extends RuntimeException {
}
}