SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-251 Initial attempt to fix Java 11 issues

Browse Source 
polishing

polishing
This commit is contained in:
Oleg Zhurakousky
2019-01-23 20:03:22 +01:00
parent b4b8c50a50
commit f405527dd7
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java
View File

@@ -42,7 +42,6 @@ import javax.annotation.PreDestroy;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
@@ -52,6 +51,7 @@ import org.springframework.boot.loader.JarLauncher;
import org.springframework.boot.loader.archive.Archive;
import org.springframework.boot.loader.archive.ExplodedArchive;
import org.springframework.boot.loader.archive.JarFileArchive;
import org.springframework.boot.system.JavaVersion;
import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
import org.springframework.cloud.function.context.FunctionCatalog;
import org.springframework.cloud.function.context.FunctionRegistration;
@@ -557,6 +557,9 @@ class FunctionCreatorConfiguration {
protected Class<?> loadClass(String name, boolean resolve)
throws ClassNotFoundException {
try {
if (name.startsWith("javax.annotation") && JavaVersion.getJavaVersion().isEqualOrNewerThan(JavaVersion.NINE)) {
return getClass().getClassLoader().loadClass(name);
}
return super.loadClass(name, resolve);
}
catch (ClassNotFoundException e) {

18
spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionCreatorConfigurationTests.java
View File

@@ -163,12 +163,6 @@ public abstract class FunctionCreatorConfigurationTests {
public static class SupplierCompositionTests
extends FunctionCreatorConfigurationTests {
@BeforeClass
public static void init() {
Assume.assumeTrue("Java > 8",
JavaVersion.getJavaVersion().isOlderThan(JavaVersion.NINE));
}
@Test
public void testSupplier() {
Supplier<Integer> function = catalog.lookup(Supplier.class, "function0");
@@ -191,12 +185,6 @@ public abstract class FunctionCreatorConfigurationTests {
public static class FunctionCompositionTests
extends FunctionCreatorConfigurationTests {
@BeforeClass
public static void init() {
Assume.assumeTrue("Java > 8",
JavaVersion.getJavaVersion().isOlderThan(JavaVersion.NINE));
}
@Test
public void testFunction() {
Function<Flux<Integer>, Flux<String>> function = catalog
@@ -219,12 +207,6 @@ public abstract class FunctionCreatorConfigurationTests {
public static class ConsumerCompositionTests
extends FunctionCreatorConfigurationTests {
@BeforeClass
public static void init() {
Assume.assumeTrue("Java > 8",
JavaVersion.getJavaVersion().isOlderThan(JavaVersion.NINE));
}
@Rule
public OutputCapture capture = new OutputCapture();