migrate java8 to java11

azure-pipelines.yml

@@ -126,6 +126,7 @@ jobs:
         displayName: 'Install NuGet Tool'
       - pwsh: |
           Get-Command mvn
+          mvn -version
         displayName: 'Check Maven is installed'
       - task: JavaToolInstaller@0 # This step is necessary as Linux image has Java 11 as default
         inputs:
@@ -149,7 +150,7 @@ jobs:
           curl -sSL https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin -v '6.0.100-rc.2.21505.57' -c 'release' --install-dir /usr/share/dotnet
         displayName: 'Install the .Net version used by the Core Tools for Linux'
         condition: eq( variables['Agent.OS'], 'Linux' )
-      - pwsh: | # Download JDK for later installation 
+      - pwsh: | # Download JDK for later installation
           Invoke-WebRequest $(JDK_DOWNLOAD_LINK) -O "$(JAVA_VERSION).tar.gz"
           $current = get-location | select -ExpandProperty Path
           Write-Host "##vso[task.setvariable variable=downloadPath;]$current"

package-pipeline.ps1

@@ -13,6 +13,10 @@ Write-Host "Building azure-functions-java-worker"
 mvn clean package --no-transfer-progress -B
 StopOnFailedExecution
 
+Write-Host "Running Integration tests of azure-functions-java-worker"
+mvn failsafe:integration-test --no-transfer-progress -B
+StopOnFailedExecution
+
 Write-Host "Creating nuget package Microsoft.Azure.Functions.JavaWorker" 
 Write-Host "buildNumber: " $buildNumber
 Get-Command nuget

pom.xml

@@ -291,6 +291,23 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.22.2</version>
+				<configuration>
+					<systemPropertyVariables>
+						<testing-project-jar>${project.artifactId}-${project.version}-tests.jar</testing-project-jar>
+					</systemPropertyVariables>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 
 			<!-- This plugin is used to generated test jar which contains all test classes -->
 			<plugin>

src/main/java/com/microsoft/azure/functions/worker/JavaWorkerClient.java

@@ -28,7 +28,7 @@ public JavaWorkerClient(IApplication app) {
         this.channel = chanBuilder.build();
         this.peer = new AtomicReference<>(null);
         this.handlerSuppliers = new HashMap<>();
-        this.classPathProvider = new FactoryClassLoader().createClassLoaderProvider();
+        this.classPathProvider = new FunctionClassLoaderProvider();
 
         this.addHandlers();
     }

src/main/java/com/microsoft/azure/functions/worker/broker/EnhancedJavaMethodExecutorImpl.java → src/main/java/com/microsoft/azure/functions/worker/broker/FunctionMethodExecutorImpl.java

@@ -12,8 +12,8 @@
  * Used to executor of arbitrary Java method in any JAR using reflection.
  * Thread-Safety: Multiple thread.
  */
-public class EnhancedJavaMethodExecutorImpl implements JavaMethodExecutor {
-    public EnhancedJavaMethodExecutorImpl(FunctionMethodDescriptor descriptor, Map<String, BindingInfo> bindingInfos, ClassLoaderProvider classLoaderProvider)
+public class FunctionMethodExecutorImpl implements JavaMethodExecutor {
+    public FunctionMethodExecutorImpl(FunctionMethodDescriptor descriptor, Map<String, BindingInfo> bindingInfos, ClassLoaderProvider classLoaderProvider)
             throws ClassNotFoundException, NoSuchMethodException
     {
         descriptor.validateMethodInfo();

src/main/java/com/microsoft/azure/functions/worker/broker/JavaFunctionBroker.java

@@ -10,7 +10,6 @@
 
 import com.microsoft.azure.functions.rpc.messages.*;
 import com.microsoft.azure.functions.worker.Constants;
-import com.microsoft.azure.functions.worker.WorkerLogManager;
 import com.microsoft.azure.functions.worker.binding.BindingDataStore;
 import com.microsoft.azure.functions.worker.binding.ExecutionRetryContext;
 import com.microsoft.azure.functions.worker.binding.ExecutionTraceContext;
@@ -35,7 +34,7 @@ public void loadMethod(FunctionMethodDescriptor descriptor, Map<String, BindingI
 		descriptor.validate();
 
 		addSearchPathsToClassLoader(descriptor);
-		JavaMethodExecutor executor = new FactoryJavaMethodExecutor().getJavaMethodExecutor(descriptor, bindings, classLoaderProvider);
+		JavaMethodExecutor executor = new FunctionMethodExecutorImpl(descriptor, bindings, classLoaderProvider);
 
 		this.methods.put(descriptor.getId(), new ImmutablePair<>(descriptor.getName(), executor));
 	}
@@ -148,22 +147,6 @@ private boolean isTesting(){
 		}
 	}
 
-	void verifyLibrariesExist (File workerLib, String workerLibPath) throws FileNotFoundException{
-		if(!workerLib.exists()) {
-			throw new FileNotFoundException("Error loading worker jars, from path:  " + workerLibPath);
-		} else {
-			File[] jarFiles = workerLib.listFiles(new FileFilter() {
-				@Override
-				public boolean accept(File file) {
-					return file.isFile() && file.getName().endsWith(".jar");
-				}
-			});
-			if(jarFiles.length == 0) {
-				throw new FileNotFoundException("Error loading worker jars, from path:  " + workerLibPath + ". Jars size is zero");
-			}
-		}
-	}
-
 	public void setWorkerDirectory(String workerDirectory) {
 		this.workerDirectory = workerDirectory;
 	}

src/main/java/com/microsoft/azure/functions/worker/handler/InvocationRequestHandler.java

@@ -6,8 +6,7 @@
 import com.microsoft.azure.functions.worker.*;
 import com.microsoft.azure.functions.worker.broker.*;
 import com.microsoft.azure.functions.rpc.messages.*;
-
-import static com.microsoft.azure.functions.worker.Util.getJavaVersion;
+import com.microsoft.azure.functions.worker.util.Util;
 
 public class InvocationRequestHandler extends MessageHandler<InvocationRequest, InvocationResponse.Builder> {
     public InvocationRequestHandler(JavaFunctionBroker broker) {
@@ -25,7 +24,7 @@ public InvocationRequestHandler(JavaFunctionBroker broker) {
 
     @Override
     String execute(InvocationRequest request, InvocationResponse.Builder response) throws Exception {
-        WorkerLogManager.getSystemLogger().log(Level.INFO, "Java version - " + getJavaVersion());
+        WorkerLogManager.getSystemLogger().log(Level.INFO, "Java version - " + Util.getJavaVersion());
         WorkerLogManager.getSystemLogger().log(Level.INFO, "InvocationRequest received by the Java worker");
         final String functionId = request.getFunctionId();
         final String invocationId = request.getInvocationId();

src/main/java/com/microsoft/azure/functions/worker/reflect/EnhancedClassLoaderProvider.java → src/main/java/com/microsoft/azure/functions/worker/reflect/FunctionClassLoaderProvider.java

@@ -8,8 +8,8 @@
 
 import com.microsoft.azure.functions.worker.*;
 
-public class EnhancedClassLoaderProvider implements ClassLoaderProvider {
-    public EnhancedClassLoaderProvider() {
+public class FunctionClassLoaderProvider implements ClassLoaderProvider {
+    public FunctionClassLoaderProvider() {
         customerUrls = Collections.newSetFromMap(new ConcurrentHashMap<URL, Boolean>());
         workerUrls = Collections.newSetFromMap(new ConcurrentHashMap<URL, Boolean>());
     }

src/main/java/com/microsoft/azure/functions/worker/Util.java → src/main/java/com/microsoft/azure/functions/worker/util/Util.java

@@ -1,4 +1,4 @@
-package com.microsoft.azure.functions.worker;
+package com.microsoft.azure.functions.worker.util;
 
 public class Util {
     public static boolean isTrue(String value) {

src/test/java/com/microsoft/azure/functions/worker/test/ExecutionTraceContextTests.java → src/test/java/com/microsoft/azure/functions/worker/binding/ExecutionTraceContextTest.java

@@ -1,14 +1,13 @@
-package com.microsoft.azure.functions.worker.test;
+package com.microsoft.azure.functions.worker.binding;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.HashMap;
 import com.microsoft.azure.functions.TraceContext;
-import com.microsoft.azure.functions.worker.binding.ExecutionTraceContext;
 
 import org.junit.Test;
 
-public class ExecutionTraceContextTests {
+public class ExecutionTraceContextTest {
 
     @Test
     public void TraceContext_test_getAndset_nonEmpty() {

src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcByteArrayDataSourceTests.java → src/test/java/com/microsoft/azure/functions/worker/binding/RpcByteArrayDataSourceTest.java

@@ -1,4 +1,4 @@
-package com.microsoft.azure.functions.worker.binding.tests;
+package com.microsoft.azure.functions.worker.binding;
 
 import static org.junit.Assert.assertEquals;
 
@@ -9,10 +9,8 @@
 import org.junit.Test;
 
 import com.google.protobuf.ByteString;
-import com.microsoft.azure.functions.worker.binding.BindingData;
-import com.microsoft.azure.functions.worker.binding.RpcByteArrayDataSource;
 
-public class RpcByteArrayDataSourceTests {
+public class RpcByteArrayDataSourceTest {
 
   @Test
   public void rpcByteArrayDataSource_To_byteArray() {

src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcCollectionByteArrayDataSourceTest.java → src/test/java/com/microsoft/azure/functions/worker/binding/RpcCollectionByteArrayDataSourceTest.java

@@ -1,4 +1,4 @@
-package com.microsoft.azure.functions.worker.binding.tests;
+package com.microsoft.azure.functions.worker.binding;
 
 import com.google.protobuf.ByteString;
 import com.microsoft.azure.functions.worker.binding.BindingData;

src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcCollectionDoubleDataSourceTest.java → src/test/java/com/microsoft/azure/functions/worker/binding/RpcCollectionDoubleDataSourceTest.java

@@ -1,5 +1,5 @@
 
-package com.microsoft.azure.functions.worker.binding.tests;
+package com.microsoft.azure.functions.worker.binding;
 
 import com.microsoft.azure.functions.rpc.messages.CollectionDouble;
 import com.microsoft.azure.functions.worker.binding.BindingData;

src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcCollectionLongDataSourceTest.java → src/test/java/com/microsoft/azure/functions/worker/binding/RpcCollectionLongDataSourceTest.java

@@ -1,4 +1,4 @@
-package com.microsoft.azure.functions.worker.binding.tests;
+package com.microsoft.azure.functions.worker.binding;
 
 import com.microsoft.azure.functions.rpc.messages.CollectionSInt64;
 import com.microsoft.azure.functions.rpc.messages.CollectionSInt64.Builder;

src/test/java/com/microsoft/azure/functions/worker/binding/tests/RpcCollectionStringDataSourceTest.java → src/test/java/com/microsoft/azure/functions/worker/binding/RpcCollectionStringDataSourceTest.java

@@ -1,4 +1,4 @@
-package com.microsoft.azure.functions.worker.binding.tests;
+package com.microsoft.azure.functions.worker.binding;
 
 import com.microsoft.azure.functions.rpc.messages.CollectionString.Builder;
 import com.microsoft.azure.functions.rpc.messages.CollectionString;