Skip to content

Commit 41230ed

Browse files
committed
move resolver to dedicate package
1 parent 7d0279f commit 41230ed

File tree

9 files changed

+16
-15
lines changed

9 files changed

+16
-15
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
import java.util.List;
77
import java.util.Map;
88
import java.util.Optional;
9-
import java.util.UUID;
109

1110
import com.microsoft.azure.functions.ExecutionContext;
1211
import com.microsoft.azure.functions.rpc.messages.ParameterBinding;
1312
import com.microsoft.azure.functions.rpc.messages.TypedData;
14-
import com.microsoft.azure.functions.worker.broker.CoreTypeResolver;
13+
import com.microsoft.azure.functions.worker.resolver.CoreTypeResolver;
1514

1615
import org.apache.commons.lang3.exception.ExceptionUtils;
1716

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package com.microsoft.azure.functions.worker.binding;
22

3-
import java.io.IOException;
43
import java.lang.reflect.Type;
54
import java.util.ArrayList;
6-
import java.util.Arrays;
7-
import java.util.Base64;
85
import java.util.Collection;
96
import java.util.HashMap;
107
import java.util.List;
@@ -15,13 +12,11 @@
1512
import org.apache.commons.lang3.exception.ExceptionUtils;
1613
import org.apache.commons.lang3.reflect.TypeUtils;
1714

18-
import com.google.gson.Gson;
1915
import com.google.gson.JsonArray;
2016
import com.google.gson.JsonParser;
2117
import com.google.gson.JsonSyntaxException;
22-
import com.google.gson.reflect.*;
2318
import com.microsoft.azure.functions.worker.WorkerLogManager;
24-
import com.microsoft.azure.functions.worker.broker.CoreTypeResolver;
19+
import com.microsoft.azure.functions.worker.resolver.CoreTypeResolver;
2520

2621
@FunctionalInterface
2722
interface CheckedFunction<T, R> {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.microsoft.azure.functions.worker.broker;
22

33
import com.microsoft.azure.functions.worker.binding.*;
4+
import com.microsoft.azure.functions.worker.resolver.ParameterResolver;
45

56
/**
67
* Used to executor of arbitrary Java method in any JAR using reflection.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.microsoft.azure.functions.worker.broker;
22

33
import com.microsoft.azure.functions.worker.binding.*;
4+
import com.microsoft.azure.functions.worker.resolver.ParameterResolver;
45

56
/**
67
* Used to executor of arbitrary Java method in any JAR using reflection.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.microsoft.azure.functions.worker.broker;
22

3+
import com.microsoft.azure.functions.worker.resolver.CoreTypeResolver;
4+
35
import java.lang.reflect.Parameter;
46
import java.lang.reflect.Type;
57

src/main/java/com/microsoft/azure/functions/worker/broker/CoreTypeResolver.java renamed to src/main/java/com/microsoft/azure/functions/worker/resolver/CoreTypeResolver.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.microsoft.azure.functions.worker.broker;
1+
package com.microsoft.azure.functions.worker.resolver;
22

33
import java.lang.annotation.*;
44
import java.lang.reflect.*;
@@ -108,7 +108,7 @@ private static String getBindingNameFromCustomBindingAnnotation(Annotation custo
108108
}
109109
}
110110

111-
static String getBindingNameAnnotation(Parameter param) {
111+
public static String getBindingNameAnnotation(Parameter param) {
112112
Annotation bindingNameAnnotation = null;
113113
for (Annotation item : param.getAnnotations()){
114114
if (item.annotationType().getName().equals("com.microsoft.azure.functions.annotation.BindingName")){
@@ -129,7 +129,7 @@ static String getBindingNameAnnotation(Parameter param) {
129129
return new String("");
130130
}
131131

132-
static boolean checkImplicitOutput(Parameter parameter) {
132+
public static boolean checkImplicitOutput(Parameter parameter) {
133133
Annotation[] annotations = parameter.getAnnotations();
134134
for (Annotation annotation : annotations) {
135135
for (Annotation item : annotation.annotationType().getAnnotations()) {

src/main/java/com/microsoft/azure/functions/worker/broker/ParameterResolver.java renamed to src/main/java/com/microsoft/azure/functions/worker/resolver/ParameterResolver.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
package com.microsoft.azure.functions.worker.broker;
1+
package com.microsoft.azure.functions.worker.resolver;
22

33
import java.lang.invoke.WrongMethodTypeException;
44
import java.lang.reflect.Type;
55
import java.util.Optional;
66

77
import com.microsoft.azure.functions.worker.binding.ExecutionContextDataSource;
8+
import com.microsoft.azure.functions.worker.broker.MethodBindInfo;
9+
import com.microsoft.azure.functions.worker.broker.ParamBindInfo;
810
import com.microsoft.azure.functions.worker.invoker.MethodInvoker;
911
import org.apache.commons.lang3.exception.ExceptionUtils;
1012
import org.apache.commons.lang3.reflect.TypeUtils;

src/test/java/com/microsoft/azure/functions/worker/broker/ParameterResolverTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.microsoft.azure.functions.worker.binding.ExecutionContextDataSource;
88
import com.microsoft.azure.functions.worker.binding.ExecutionRetryContext;
99
import com.microsoft.azure.functions.worker.binding.ExecutionTraceContext;
10+
import com.microsoft.azure.functions.worker.resolver.ParameterResolver;
1011
import org.junit.jupiter.api.BeforeEach;
1112
import org.junit.jupiter.api.Test;
1213
import org.junit.jupiter.api.extension.ExtendWith;

src/test/java/com/microsoft/azure/functions/worker/broker/tests/CoreTypeResolverTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
import com.microsoft.azure.functions.*;
77
import com.microsoft.azure.functions.annotation.*;
8-
import com.microsoft.azure.functions.worker.broker.CoreTypeResolver;
8+
import com.microsoft.azure.functions.worker.resolver.CoreTypeResolver;
99

1010
import org.apache.commons.lang3.StringUtils;
1111
import org.junit.jupiter.api.Test;
1212

13-
import static com.microsoft.azure.functions.worker.broker.CoreTypeResolver.getRuntimeClass;
14-
import static com.microsoft.azure.functions.worker.broker.CoreTypeResolver.isValidOutputType;
13+
import static com.microsoft.azure.functions.worker.resolver.CoreTypeResolver.getRuntimeClass;
14+
import static com.microsoft.azure.functions.worker.resolver.CoreTypeResolver.isValidOutputType;
1515
import static org.junit.jupiter.api.Assertions.*;
1616

1717
public class CoreTypeResolverTest {

0 commit comments

Comments
 (0)