Merge branch 'master' into dev

ch02/productinfo/java/client/build.gradle

@@ -12,7 +12,7 @@ def grpcVersion = '1.39.0'
         compile "io.grpc:grpc-protobuf:${grpcVersion}"
         compile "io.grpc:grpc-stub:${grpcVersion}"
         compile 'com.google.protobuf:protobuf-java:3.17.2'
-        compile 'javax.annotation:javax.annotation-api:1.2'
+        compile 'javax.annotation:javax.annotation-api:1.3.2'
     }
 
 buildscript {

ch02/productinfo/java/server/build.gradle

@@ -12,7 +12,7 @@ dependencies {
     compile "io.grpc:grpc-protobuf:${grpcVersion}"
     compile "io.grpc:grpc-stub:${grpcVersion}"
     compile 'com.google.protobuf:protobuf-java:3.17.2'
-    compile 'javax.annotation:javax.annotation-api:1.2'
+    compile 'javax.annotation:javax.annotation-api:1.3.2'
 }
 
 buildscript {

ch03/README.md

@@ -41,6 +41,7 @@ message CombinedShipment {
 
 - [Go](./order-service/go/README.md)
 - [Java](./order-service/java/README.md)
+- [Python](./order-service/python/README.md)
 
 
 

ch03/order-service/go/client/main.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"context"
-	"google.golang.org/grpc"
 	"log"
 	pb "ordermgt/client/ecommerce"
 	"time"
+
+	"google.golang.org/grpc"
 )
 
 const (
@@ -19,8 +20,8 @@ func main() {
 		log.Fatalf("did not connect: %v", err)
 	}
 	defer conn.Close()
-	client  := pb.NewOrderManagementClient(conn)
-	ctx , cancel := context.WithTimeout(context.Background(), time.Second*5)
+	client := pb.NewOrderManagementClient(conn)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()
 
 	// Add Order
@@ -110,7 +111,7 @@ func main() {
 	// if err := streamProcOrder.CloseSend(); err != nil {
 	// 	log.Fatal(err)
 	// }
-	// <- channel
+	// channel <- struct{}{}
 }
 
 //func asncClientBidirectionalRPC(streamProcOrder pb.OrderManagement_ProcessOrdersClient, c chan struct{}) {

ch03/order-service/proto/order_management.proto

@@ -1,4 +1,3 @@
-// Deprecated !!!!
 syntax = "proto3";
 
 import "google/protobuf/wrappers.proto";

ch03/order-service/python/README.md

@@ -0,0 +1,43 @@
+## ``OrderManagement`` Service and Client - Python Implementation
+
+## Prerequisites 
+- Python 3.5 or higher
+- pip version 9.0.1 or higher
+
+If necessary, upgrade your version of pip:
+```
+python -m pip install --upgrade pip
+```
+
+Install gRPC and gRPC tools 
+
+```
+python -m pip install --upgrade pip
+python -m pip install grpcio
+python -m pip install grpcio-tools
+
+```
+
+## Code Generation 
+
+Generate Python code by pointing to the .proto file. 
+
+```
+python -m grpc_tools.protoc -I. --python_out=. --grpc_python_out=. order_management.proto
+
+```
+
+
+## Running the Service
+Run the server with: 
+
+```
+python server.py
+```
+
+## Running the Client   
+
+Run the client with: 
+```
+python server.py
+```

ch03/order-service/python/client/client.py

@@ -0,0 +1,93 @@
+from google.protobuf import wrappers_pb2
+import grpc
+import order_management_pb2
+import order_management_pb2_grpc
+
+import time
+
+
+def run():
+    channel = grpc.insecure_channel('localhost:50051')
+
+
+
+    stub = order_management_pb2_grpc.OrderManagementStub(channel)
+
+    order1 = order_management_pb2.Order(items=['Item - A', 'Item - B', 'Item - C'],
+                                        price=2450.50,
+                                        description='This is a Sample order - 1 : description.', 
+                                        destination='San Jose, CA')
+
+
+    order = stub.getOrder(order_management_pb2.Order(id='101'))
+    print("Order service response", order)
+
+    # Unary RPC : Adding an Order
+    response = stub.addOrder(order1)
+    print('Add order response :', response)
+
+    # Server Streaming
+    for order_search_result in stub.searchOrders(wrappers_pb2.StringValue(value='Item - A')):
+        print('Search Result : ', order_search_result)
+
+    # Client Streaming
+    upd_order_iterator = generate_orders_for_updates()
+    upd_status = stub.updateOrders(upd_order_iterator)
+    print('Order update status : ', upd_status)
+
+
+    # Bi-di Streaming 
+    proc_order_iterator = generate_orders_for_processing()
+    for shipment in stub.processOrders(proc_order_iterator):
+        print(shipment)
+
+
+def generate_orders_for_updates():
+    ord1 = order_management_pb2.Order(id='101', price=1000, 
+                                      items=['Item - A', 'Item - B', 'Item - C', 'Item - D'], 
+                                      description='Sample order description.', 
+                                      destination='Mountain View, CA')
+    ord2 = order_management_pb2.Order(id='102', price=1000, 
+                                      items=['Item - E', 'Item - Q', 'Item - R', 'Item - D'], 
+                                      description='Sample order description.', 
+                                      destination='San Jose, CA')
+    ord3 = order_management_pb2.Order(id='103', price=1000, 
+                                      items=['Item - A', 'Item - K'], 
+                                      description='Sample order description.', 
+                                      destination='San Francisco, CA')
+    list = []
+    list.append(ord1)
+    list.append(ord2)
+    list.append(ord3)
+
+    for updated_orders in list:
+        yield updated_orders
+
+def generate_orders_for_processing():
+    ord1 = order_management_pb2.Order(
+        id='104', price=2332,
+        items=['Item - A', 'Item - B'],  
+        description='Updated desc', 
+        destination='San Jose, CA')
+    ord2 = order_management_pb2.Order(
+        id='105', price=3000, 
+        description='Updated desc', 
+        destination='San Francisco, CA')
+    ord3 = order_management_pb2.Order(
+        id='106', price=2560, 
+        description='Updated desc', 
+        destination='San Francisco, CA')
+    ord4 = order_management_pb2.Order(
+        id='107', price=2560, 
+        description='Updated desc', 
+        destination='Mountain View, CA')
+    list = []
+    list.append(ord1)
+    list.append(ord1)
+    list.append(ord3)
+    list.append(ord4)
+
+    for processing_orders in list:
+        yield processing_orders
+
+run()