Remove SpEL from Jafu samples

Closes spring-atticgh-72

spring-graal-native-samples/jafu-webmvc/pom.xml

@@ -26,18 +26,43 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.yaml</groupId>
+					<artifactId>snakeyaml</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.fu</groupId>
+			<artifactId>spring-fu-jafu</artifactId>
+			<version>0.3.0.M2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-expression</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-expression</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.graalvm.nativeimage</groupId>
 			<artifactId>graal-hotspot-library</artifactId>
 			<version>20.0.0</version>
 			<scope>provided</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.fu</groupId>
-			<artifactId>spring-fu-jafu</artifactId>
-			<version>0.3.0.M2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

spring-graal-native-samples/jafu-webmvc/src/main/java/com/example/jafu/Target_SpringApplication.java

@@ -0,0 +1,18 @@
+package com.example.jafu;
+
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ServletWebServerApplicationContextWithoutSpel;
+
+@TargetClass(className = "org.springframework.boot.SpringApplication")
+public final class Target_SpringApplication {
+
+	// Use the application context without SpEL and avoid reflection
+	@Substitute
+	protected ConfigurableApplicationContext createApplicationContext() {
+		return new ServletWebServerApplicationContextWithoutSpel();
+	}
+}

spring-graal-native-samples/jafu-webmvc/src/main/resources/META-INF/native-image/reflect-config.json

@@ -63,20 +63,6 @@
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true
   },
-  {
-    "name": "org.springframework.web.context.ConfigurableWebApplicationContext",
-    "allDeclaredConstructors": true,
-    "allDeclaredMethods": true
-  },
-  {
-    "name": "org.springframework.web.context.WebApplicationContext",
-    "allDeclaredConstructors": true,
-    "allDeclaredMethods": true
-  },
-  {
-    "name": "org.springframework.context.ConfigurableApplicationContext",
-    "allDeclaredConstructors": true
-  },
   {
     "name": "org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory$StaticResourceConfigurer",
     "allDeclaredConstructors": true,
@@ -97,11 +83,6 @@
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true
   },
-  {
-    "name": "org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext",
-    "allDeclaredConstructors": true,
-    "allDeclaredMethods": true
-  },
   {
     "name": "org.springframework.boot.web.server.WebServerFactoryCustomizerBeanPostProcessor",
     "allDeclaredConstructors": true,

spring-graal-native-samples/jafu/compile.sh

@@ -22,6 +22,9 @@ cd target/native-image
 jar -xvf ../$JAR >/dev/null 2>&1
 cp -R META-INF BOOT-INF/classes
 
+# Avoids clashing substitutions from this project deps and the feature deps
+rm BOOT-INF/lib/svm-20.*.jar
+
 LIBPATH=`find BOOT-INF/lib | tr '\n' ':'`
 CP=BOOT-INF/classes:$LIBPATH:$FEATURE
 

spring-graal-native-samples/jafu/pom.xml

@@ -22,12 +22,34 @@
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.yaml</groupId>
+					<artifactId>snakeyaml</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.fu</groupId>
 			<artifactId>spring-fu-jafu</artifactId>
 			<version>0.3.0.M2</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-expression</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.graalvm.nativeimage</groupId>
+			<artifactId>graal-hotspot-library</artifactId>
+			<version>20.0.0</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

spring-graal-native-samples/jafu/src/main/java/com/example/jafu/Target_SpringApplication.java

@@ -0,0 +1,18 @@
+package com.example.jafu;
+
+
+import com.oracle.svm.core.annotate.Substitute;
+import com.oracle.svm.core.annotate.TargetClass;
+
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.GenericApplicationContextWithoutSpel;
+
+@TargetClass(className = "org.springframework.boot.SpringApplication")
+public final class Target_SpringApplication {
+
+	// Use the application context without SpEL and avoid reflection
+	@Substitute
+	protected ConfigurableApplicationContext createApplicationContext() {
+		return new GenericApplicationContextWithoutSpel();
+	}
+}

spring-graal-native-samples/jafu/src/main/java/org/springframework/context/support/GenericApplicationContextWithoutSpel.java

@@ -0,0 +1,55 @@
+package org.springframework.context.support;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.support.ResourceEditorRegistrar;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.ApplicationEventPublisherAware;
+import org.springframework.context.EmbeddedValueResolverAware;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.context.MessageSourceAware;
+import org.springframework.context.ResourceLoaderAware;
+import org.springframework.core.io.ResourceLoader;
+
+// Skip StandardBeanExpressionResolver and LoadTimeWeaver
+public class GenericApplicationContextWithoutSpel extends GenericApplicationContext {
+
+	@Override
+	protected void prepareBeanFactory(ConfigurableListableBeanFactory beanFactory) {
+		// Tell the internal bean factory to use the context's class loader etc.
+		beanFactory.setBeanClassLoader(getClassLoader());
+		beanFactory.addPropertyEditorRegistrar(new ResourceEditorRegistrar(this, getEnvironment()));
+
+		// Configure the bean factory with context callbacks.
+		beanFactory.addBeanPostProcessor(new ApplicationContextAwareProcessor(this));
+		beanFactory.ignoreDependencyInterface(EnvironmentAware.class);
+		beanFactory.ignoreDependencyInterface(EmbeddedValueResolverAware.class);
+		beanFactory.ignoreDependencyInterface(ResourceLoaderAware.class);
+		beanFactory.ignoreDependencyInterface(ApplicationEventPublisherAware.class);
+		beanFactory.ignoreDependencyInterface(MessageSourceAware.class);
+		beanFactory.ignoreDependencyInterface(ApplicationContextAware.class);
+
+		// BeanFactory interface not registered as resolvable type in a plain factory.
+		// MessageSource registered (and found for autowiring) as a bean.
+		beanFactory.registerResolvableDependency(BeanFactory.class, beanFactory);
+		beanFactory.registerResolvableDependency(ResourceLoader.class, this);
+		beanFactory.registerResolvableDependency(ApplicationEventPublisher.class, this);
+		beanFactory.registerResolvableDependency(ApplicationContext.class, this);
+
+		// Register early post-processor for detecting inner beans as ApplicationListeners.
+		beanFactory.addBeanPostProcessor(new ApplicationListenerDetector(this));
+
+		// Register default environment beans.
+		if (!beanFactory.containsLocalBean(ENVIRONMENT_BEAN_NAME)) {
+			beanFactory.registerSingleton(ENVIRONMENT_BEAN_NAME, getEnvironment());
+		}
+		if (!beanFactory.containsLocalBean(SYSTEM_PROPERTIES_BEAN_NAME)) {
+			beanFactory.registerSingleton(SYSTEM_PROPERTIES_BEAN_NAME, getEnvironment().getSystemProperties());
+		}
+		if (!beanFactory.containsLocalBean(SYSTEM_ENVIRONMENT_BEAN_NAME)) {
+			beanFactory.registerSingleton(SYSTEM_ENVIRONMENT_BEAN_NAME, getEnvironment().getSystemEnvironment());
+		}
+	}
+}

spring-graal-native-substitutions/src/main/java/org/springframework/internal/svm/RemoveSpelSupport.java

@@ -0,0 +1,12 @@
+package org.springframework.internal.svm;
+
+import java.util.function.BooleanSupplier;
+
+public class RemoveSpelSupport implements BooleanSupplier {
+
+	@Override
+	public boolean getAsBoolean() {
+		return Boolean.valueOf(System.getProperty("spring.graal.remove-spel-support", "false"));
+	}
+
+}