Simplifies the messy logics on paramter resolving

endtoendtests/pom.xml

@@ -22,7 +22,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 		<azure.functions.maven.plugin.version>1.18.0</azure.functions.maven.plugin.version>
-		<azure.functions.java.library.version>3.0.0-SNAPSHOT</azure.functions.java.library.version>
+		<azure.functions.java.library.version>3.0.0</azure.functions.java.library.version>
 		<durabletask.azure.functions>1.0.0-beta.1</durabletask.azure.functions>
 		<functionAppName>azure-functions-java-endtoendtests</functionAppName>
 		<functionAppRegion>westus</functionAppRegion>

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

@@ -12,7 +12,7 @@
 
 import com.microsoft.azure.functions.worker.broker.*;
 import com.microsoft.azure.functions.worker.handler.*;
-import com.microsoft.azure.functions.worker.reflect.*;
+import com.microsoft.azure.functions.worker.classloader.*;
 import com.microsoft.azure.functions.rpc.messages.*;
 
 /**

src/main/java/com/microsoft/azure/functions/worker/binding/BindingDataStore.java

@@ -6,12 +6,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.UUID;
 
 import com.microsoft.azure.functions.ExecutionContext;
 import com.microsoft.azure.functions.rpc.messages.ParameterBinding;
 import com.microsoft.azure.functions.rpc.messages.TypedData;
-import com.microsoft.azure.functions.worker.broker.CoreTypeResolver;
+import com.microsoft.azure.functions.worker.converter.CoreTypeConverter;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 
@@ -21,16 +20,22 @@
  * Thread-safety: Single thread.
  */
 public final class BindingDataStore {
+
+    private final Map<String, DataTarget> targets;
+    private final Map<String, DataSource<?>> inputSources;
+    private final Map<Type, DataSource<?>> otherSources;
+    private final Map<String, DataSource<?>> metadataSources;
+    private Map<String, BindingDefinition> definitions;
+    public static final String RETURN_NAME = "$return";
+
     public BindingDataStore() {
         this.targets = new HashMap<>();
         this.inputSources = new HashMap<>();
         this.otherSources = new HashMap<>();
         this.metadataSources = new HashMap<>();
-        this.promotedTargets = null;
     }
 
-    ///////////////////////// region Input Binding Data
-
+    //Logics for input Binding Data
     public void addParameterSources(List<ParameterBinding> parameters) {
         assert parameters != null;
         for (ParameterBinding parameter : parameters) {
@@ -92,24 +97,21 @@ private static DataSource<?> rpcSourceFromParameter(ParameterBinding parameter)
         return rpcSourceFromTypedData(parameter.getName(), parameter.getData());
     }
 
-    ///////////////////////// end region Input Binding Data
-
-    ///////////////////////// region Output Binding Data
 
-    public List<ParameterBinding> getOutputParameterBindings(boolean excludeReturn) throws Exception {
+    //Logics for output Binding Data
+    public List<ParameterBinding> getOutputParameterBindings() throws Exception {
         List<ParameterBinding> bindings = new ArrayList<>();
-        for (Map.Entry<String, DataTarget> entry : this.getTarget(this.promotedTargets).entrySet()) {
-            if (!excludeReturn || !entry.getKey().equals(RETURN_NAME)) {
-                entry.getValue().computeFromValue().ifPresent(data ->
-                    bindings.add(ParameterBinding.newBuilder().setName(entry.getKey()).setData(data).build())
-                );
-            }
+        for (String key : this.targets.keySet()) {
+            if (key.equals(RETURN_NAME)) continue;
+            DataTarget dataTarget = this.targets.get(key);
+            dataTarget.computeFromValue().ifPresent(data ->
+                    bindings.add(ParameterBinding.newBuilder().setName(key).setData(data).build()));
         }
         return bindings;
     }
 
     public Optional<TypedData> getDataTargetTypedValue(String name) throws Exception{
-    	return Optional.ofNullable(this.getTarget(this.promotedTargets).get(name)).map(o -> {
+    	return Optional.ofNullable(this.targets.get(name)).map(o -> {
 			try {
 				return o.computeFromValue().orElse(null);
 			} catch (Exception ex) {
@@ -119,48 +121,37 @@ public Optional<TypedData> getDataTargetTypedValue(String name) throws Exception
 		});
     }
 
-    public Optional<BindingData> getOrAddDataTarget(UUID outputId, String name, Type target, boolean hasImplicitOutput) {
+    public Optional<BindingData> getOrAddDataTarget(String name, Type target, boolean hasImplicitOutput) {
         DataTarget output = null;
         if (this.isDataTargetValid(name, target)) {
-            output = this.getTarget(outputId).get(name);
+            output = this.targets.get(name);
             if (output == null && (this.isDefinitionOutput(name) || hasImplicitOutput)) {
-                this.getTarget(outputId).put(name, output = rpcDataTargetFromType(target));
+                this.targets.put(name, output = rpcDataTargetFromType(target));
             }
         }
-        return Optional.ofNullable(output).map(out -> new BindingData(out));
+        return Optional.ofNullable(output).map(BindingData::new);
     }
 
     public void setDataTargetValue(String name, Object value) {
-        Optional.ofNullable(this.getTarget(this.promotedTargets).get(name)).ifPresent(out -> out.setValue(value));
-    }
-
-    public void promoteDataTargets(UUID outputId) {
-        this.promotedTargets = outputId;
-    }
-
-    private Map<String, DataTarget> getTarget(UUID outputId) {
-        return this.targets.computeIfAbsent(outputId, m -> new HashMap<>());
+        Optional.ofNullable(this.targets.get(name)).ifPresent(out -> out.setValue(value));
     }
 
     private boolean isDataTargetValid(String name, Type target) {
         if (!name.equals(RETURN_NAME)) {
-            if (!CoreTypeResolver.isValidOutputType(target)) { return false; }
-            target = CoreTypeResolver.getParameterizedActualTypeArgumentsType(target);
+            if (!CoreTypeConverter.isValidOutputType(target)) { return false; }
+            target = CoreTypeConverter.getParameterizedActualTypeArgumentsType(target);
         }
         return true;
     }
 
     private static DataTarget rpcDataTargetFromType(Type target) {
-        if (CoreTypeResolver.isHttpResponse(target)) {
+        if (CoreTypeConverter.isHttpResponse(target)) {
             return new RpcHttpDataTarget();
         }
         return new RpcUnspecifiedDataTarget();
     }
 
-    ///////////////////////// end region Output Binding Data
-
-    ///////////////////////// region Binding Definitions
-
+    //Logics for binding Definitions
     public void setBindingDefinitions(Map<String, BindingDefinition> definitions) {
         this.definitions = definitions;
     }
@@ -172,14 +163,4 @@ private boolean isDefinitionOutput(String name) {
     private Optional<BindingDefinition> getDefinition(String name) {
         return Optional.ofNullable(this.definitions.get(name));
     }
-
-    ///////////////////////// endregion Binding Definitions
-
-    private UUID promotedTargets;
-    private final Map<UUID, Map<String, DataTarget>> targets;
-    private final Map<String, DataSource<?>> inputSources;
-    private final Map<Type, DataSource<?>> otherSources;
-    private final Map<String, DataSource<?>> metadataSources;
-    private Map<String, BindingDefinition> definitions;
-    public static final String RETURN_NAME = "$return";
 }

src/main/java/com/microsoft/azure/functions/worker/binding/DataOperations.java

@@ -1,10 +1,7 @@
 package com.microsoft.azure.functions.worker.binding;
 
-import java.io.IOException;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Base64;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -15,13 +12,11 @@
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.lang3.reflect.TypeUtils;
 
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
-import com.google.gson.reflect.*;
 import com.microsoft.azure.functions.worker.WorkerLogManager;
-import com.microsoft.azure.functions.worker.broker.CoreTypeResolver;
+import com.microsoft.azure.functions.worker.converter.CoreTypeConverter;
 
 @FunctionalInterface
 interface CheckedFunction<T, R> {
@@ -101,7 +96,7 @@ Optional<R> apply(T sourceValue, Type targetType) {
 
 				// Try POJO
 				if (Collection.class.isAssignableFrom(TypeUtils.getRawType(targetType, null))) {
-					Class<?> collectionItemType = (Class<?>) CoreTypeResolver
+					Class<?> collectionItemType = (Class<?>) CoreTypeConverter
 							.getParameterizedActualTypeArgumentsType(targetType);
 
 					try {
@@ -185,7 +180,7 @@ static Object generalAssignment(Object value, Type target) {
 		if (value == null) {
 			return ObjectUtils.NULL;
 		}
-		if (CoreTypeResolver.getRuntimeClass(target).isAssignableFrom(value.getClass())) {
+		if (CoreTypeConverter.getRuntimeClass(target).isAssignableFrom(value.getClass())) {
 			return value;
 		}
 		throw new ClassCastException("Cannot convert " + value + "to type " + target.getTypeName());

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

@@ -3,7 +3,7 @@
 import com.microsoft.azure.functions.rpc.messages.BindingInfo;
 import com.microsoft.azure.functions.worker.binding.BindingDefinition;
 import com.microsoft.azure.functions.worker.description.FunctionMethodDescriptor;
-import com.microsoft.azure.functions.worker.reflect.ClassLoaderProvider;
+import com.microsoft.azure.functions.worker.classloader.ClassLoaderProvider;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

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

@@ -19,7 +19,7 @@
 import com.microsoft.azure.functions.worker.chain.FunctionExecutionMiddleware;
 import com.microsoft.azure.functions.worker.chain.InvocationChainFactory;
 import com.microsoft.azure.functions.worker.description.FunctionMethodDescriptor;
-import com.microsoft.azure.functions.worker.reflect.ClassLoaderProvider;
+import com.microsoft.azure.functions.worker.classloader.ClassLoaderProvider;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
@@ -122,7 +122,7 @@ public Optional<TypedData> invokeMethod(String id, InvocationRequest request, Li
 			throws Exception {
 		ExecutionContextDataSource executionContextDataSource = buildExecutionContext(id, request);
 		invoke(executionContextDataSource);
-		outputs.addAll(executionContextDataSource.getDataStore().getOutputParameterBindings(true));
+		outputs.addAll(executionContextDataSource.getDataStore().getOutputParameterBindings());
 		return executionContextDataSource.getDataStore().getDataTargetTypedValue(BindingDataStore.RETURN_NAME);
 	}
 

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

@@ -1,6 +1,7 @@
 package com.microsoft.azure.functions.worker.broker;
 
 import com.microsoft.azure.functions.worker.binding.*;
+import com.microsoft.azure.functions.worker.converter.ParameterConverter;
 
 /**
  * Used to executor of arbitrary Java method in any JAR using reflection.
@@ -17,9 +18,9 @@ public static JavaMethodExecutor getInstance(){
     private JavaMethodExecutor() {}
 
     public void execute(ExecutionContextDataSource executionContextDataSource) throws Exception {
-        Object retValue = ParameterResolver.resolveArguments(executionContextDataSource)
+        Object retValue = ParameterConverter.resolveArguments(executionContextDataSource)
                 .orElseThrow(() -> new NoSuchMethodException("Cannot locate the method signature with the given input"))
-                .invoke(executionContextDataSource::getFunctionInstance);
+                .invoke(executionContextDataSource.getFunctionInstance());
         executionContextDataSource.updateReturnValue(retValue);
     }
 }

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

@@ -1,5 +1,7 @@
 package com.microsoft.azure.functions.worker.broker;
 
+import com.microsoft.azure.functions.worker.converter.CoreTypeConverter;
+
 import java.lang.reflect.Parameter;
 import java.lang.reflect.Type;
 
@@ -11,10 +13,10 @@ public final class ParamBindInfo {
     private final boolean isImplicitOutput;
     private final Parameter parameter;
     ParamBindInfo(Parameter param) {
-        this.name = CoreTypeResolver.getAnnotationName(param);
+        this.name = CoreTypeConverter.getAnnotationName(param);
         this.type = param.getParameterizedType();
-        this.bindingNameAnnotation = CoreTypeResolver.getBindingNameAnnotation(param);
-        this.isImplicitOutput = CoreTypeResolver.checkImplicitOutput(param);
+        this.bindingNameAnnotation = CoreTypeConverter.getBindingNameAnnotation(param);
+        this.isImplicitOutput = CoreTypeConverter.checkImplicitOutput(param);
         this.parameter = param;
     }
 

src/main/java/com/microsoft/azure/functions/worker/reflect/ClassLoaderProvider.java → src/main/java/com/microsoft/azure/functions/worker/classloader/ClassLoaderProvider.java

@@ -1,4 +1,4 @@
-package com.microsoft.azure.functions.worker.reflect;
+package com.microsoft.azure.functions.worker.classloader;
 
 import java.io.*;
 import java.net.*;

src/main/java/com/microsoft/azure/functions/worker/reflect/DefaultClassLoaderProvider.java → src/main/java/com/microsoft/azure/functions/worker/classloader/DefaultClassLoaderProvider.java

@@ -1,4 +1,4 @@
-package com.microsoft.azure.functions.worker.reflect;
+package com.microsoft.azure.functions.worker.classloader;
 
 import java.io.*;
 import java.lang.reflect.*;

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

@@ -1,4 +1,4 @@
-package com.microsoft.azure.functions.worker.reflect;
+package com.microsoft.azure.functions.worker.classloader;
 
 import java.io.*;
 import java.net.*;

src/main/java/com/microsoft/azure/functions/worker/reflect/FactoryClassLoader.java → src/main/java/com/microsoft/azure/functions/worker/classloader/FactoryClassLoader.java

@@ -1,4 +1,4 @@
-package com.microsoft.azure.functions.worker.reflect;
+package com.microsoft.azure.functions.worker.classloader;
 
 import org.apache.commons.lang3.SystemUtils;
 

src/main/java/com/microsoft/azure/functions/worker/broker/CoreTypeResolver.java → src/main/java/com/microsoft/azure/functions/worker/converter/CoreTypeConverter.java

@@ -1,12 +1,12 @@
-package com.microsoft.azure.functions.worker.broker;
+package com.microsoft.azure.functions.worker.converter;
 
 import java.lang.annotation.*;
 import java.lang.reflect.*;
 
 import com.microsoft.azure.functions.*;
 import com.microsoft.azure.functions.worker.Constants;
 
-public class CoreTypeResolver {
+public class CoreTypeConverter {
 	private static boolean isOutputParameter(Type target) {
 		if (target instanceof ParameterizedType) {
 			target = ((ParameterizedType) target).getRawType();
@@ -108,7 +108,7 @@ private static String getBindingNameFromCustomBindingAnnotation(Annotation custo
 		}
 	}
 
-	static String getBindingNameAnnotation(Parameter param) {
+	public static String getBindingNameAnnotation(Parameter param) {
 		Annotation bindingNameAnnotation = null;
 		for (Annotation item : param.getAnnotations()){
 			if (item.annotationType().getName().equals("com.microsoft.azure.functions.annotation.BindingName")){
@@ -129,7 +129,7 @@ static String getBindingNameAnnotation(Parameter param) {
 		return new String("");
 	}
 
-	static boolean checkImplicitOutput(Parameter parameter) {
+	public static boolean checkImplicitOutput(Parameter parameter) {
 		Annotation[] annotations = parameter.getAnnotations();
 		for (Annotation annotation : annotations) {
 			for (Annotation item : annotation.annotationType().getAnnotations()) {