From f405527dd7d972b5c5dc936327e54446b5c6852f Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Wed, 23 Jan 2019 20:03:22 +0100
Subject: [PATCH] GH-251 Initial attempt to fix Java 11 issues

polishing

polishing
---
 pom.xml                                        |  6 +++++-
 spring-cloud-function-deployer/pom.xml         |  8 +++++++-
 .../deployer/FunctionCreatorConfiguration.java |  5 ++++-
 .../FunctionCreatorConfigurationTests.java     | 18 ------------------
 4 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34e2f6735..631db95b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<artifactId>spring-cloud-function-parent</artifactId>
@@ -16,6 +18,8 @@
 
 	<properties>
 		<java.version>1.8</java.version>
+		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<spring-cloud-task.version>2.0.0.RELEASE</spring-cloud-task.version>
 		<wrapper.version>1.0.15.RELEASE</wrapper.version>
 		<docs.main>spring-cloud-function</docs.main>
diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml
index cd29eb80f..048cdc641 100644
--- a/spring-cloud-function-deployer/pom.xml
+++ b/spring-cloud-function-deployer/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -54,6 +55,11 @@
 			<artifactId>spring-boot-starter-logging</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+		</dependency>
 	</dependencies>
 
 	<build>
diff --git a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java
index 9a872c500..4dfd16b24 100644
--- a/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java
+++ b/spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java
@@ -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) {
diff --git a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionCreatorConfigurationTests.java b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionCreatorConfigurationTests.java
index 20a1c6f90..c95745475 100644
--- a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionCreatorConfigurationTests.java
+++ b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionCreatorConfigurationTests.java
@@ -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();