Merge branch 'dev' of https://github.com/Azure/azure-functions-java-worker

Author: pragnagopa

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.microsoft.azure.functions</groupId>
   <artifactId>azure-functions-java-worker</artifactId>
-  <version>1.1.0-beta7</version>
+  <version>1.1.0-beta8</version>
   <packaging>jar</packaging>
 
   <name>Microsoft Azure Functions Java Runtime</name>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.microsoft.azure.functions</groupId>
       <artifactId>azure-functions-java-library</artifactId>
-      <version>1.0.0-beta-4</version>
+      <version>1.0.0-beta-5</version>
     </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>

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

@@ -17,7 +17,6 @@
 
 import static com.microsoft.azure.functions.worker.binding.BindingData.MatchingLevel.*;
 
-
 final class ExecutionContextDataSource extends DataSource<ExecutionContext> implements ExecutionContext {
     ExecutionContextDataSource(String invocationId, String funcname) {
         super(null, null, EXECONTEXT_DATA_OPERATIONS);
@@ -112,7 +111,7 @@ private HttpRequestMessageImpl(RpcHttpRequestDataSource parentDataSource, Object
         @Override
         public URI getUri() { return URI.create(this.parentDataSource.httpPayload.getUrl()); }
         @Override
-        public String getMethod() { return this.parentDataSource.httpPayload.getMethod(); }
+        public HttpMethod getHttpMethod() { return HttpMethod.value(this.parentDataSource.httpPayload.getMethod()); }
         @Override
         public Map<String, String> getHeaders() { return this.parentDataSource.httpPayload.getHeadersMap(); }
         @Override
@@ -121,16 +120,8 @@ private HttpRequestMessageImpl(RpcHttpRequestDataSource parentDataSource, Object
         public Object getBody() { return this.body; }
 
         @Override
-        public HttpResponseMessage createResponse(int status) {
-            return createResponse(status, null);
-        }
-
-        @Override
-        public HttpResponseMessage createResponse(int status, Object body) {
-            RpcHttpDataTarget response = new RpcHttpDataTarget();
-            response.setStatus(status);
-            response.setBody(body);
-            return response;
+        public HttpResponseMessage.Builder createResponseBuilder(HttpStatus status) {
+            return new RpcHttpDataTarget().status(status);
         }
 
         private RpcHttpRequestDataSource parentDataSource;

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

@@ -11,35 +11,29 @@
 
 import static com.microsoft.azure.functions.worker.binding.BindingData.MatchingLevel.*;
 
-final class RpcHttpDataTarget extends DataTarget implements HttpResponseMessage {
+final class RpcHttpDataTarget extends DataTarget implements HttpResponseMessage, HttpResponseMessage.Builder {
     RpcHttpDataTarget() {
         super(HTTP_TARGET_OPERATIONS);
         this.headers = new HashMap<>();
-        this.status = 200;
+        this.status = HttpStatus.valueOf(200);
         super.setValue(this);
     }
 
     @Override
-    public int getStatus() { return this.status; }
-    @Override
-    public void setStatus(int status) { this.status = status; }
-    @Override
-    public void addHeader(String key, String value) { this.headers.put(key, value); }
+    public HttpStatus getStatus() { return this.status; }
     @Override
     public String getHeader(String key) { return this.headers.get(key); }
     @Override
     public Object getBody() { return this.body; }
-    @Override
-    public void setBody(Object body) { this.body = body; }
 
-    private int status;
+    private HttpStatus status;
     private Object body;
     private Map<String, String> headers;
 
     private static TypedData.Builder toHttpData(RpcHttpDataTarget response) {
         TypedData.Builder dataBuilder = TypedData.newBuilder();
         if (response != null) {
-            RpcHttp.Builder httpBuilder = RpcHttp.newBuilder().setStatusCode(response.getStatus() + "");
+            RpcHttp.Builder httpBuilder = RpcHttp.newBuilder().setStatusCode(response.getStatus().value() + "");
             response.headers.forEach(httpBuilder::putHeaders);
             RpcUnspecifiedDataTarget bodyTarget = new RpcUnspecifiedDataTarget();
             bodyTarget.setValue(response.getBody());
@@ -54,6 +48,29 @@ private static TypedData.Builder toHttpData(RpcHttpDataTarget response) {
         HTTP_TARGET_OPERATIONS.addOperation(TYPE_ASSIGNMENT, HttpResponseMessage.class, v -> toHttpData((RpcHttpDataTarget) v));
         HTTP_TARGET_OPERATIONS.addOperation(TYPE_ASSIGNMENT, RpcHttpDataTarget.class, v -> toHttpData((RpcHttpDataTarget) v));
     }
+
+	@Override
+	public Builder status(HttpStatus status) {
+        this.status = status;
+		return this;
+	}
+
+	@Override
+	public Builder header(String key, String value) {
+        this.headers.put(key, value);
+		return this;
+	}
+
+	@Override
+	public Builder body(Object body) {
+        this.body = body;
+		return this;
+	}
+
+	@Override
+	public HttpResponseMessage build() {
+		return this;
+	}
 }
 
 final class RpcUnspecifiedDataTarget extends DataTarget {

tools/AzureFunctionsJavaWorker.nuspec

@@ -4,7 +4,7 @@
     <id>Microsoft.Azure.Functions.JavaWorker</id>
     <title>Microsoft Azure Functions Java Worker</title>
     <tags>java azure-functions azure</tags>
-    <version>1.1.0-beta7$version$</version>
+    <version>1.1.0-beta8$version$</version>
     <authors>Microsoft</authors>
     <owners>Microsoft</owners>
     <projectUrl>https://github.com/Azure/azure-functions-java-worker</projectUrl>